diff --git a/.gitignore b/.gitignore index 1573607..ce25979 100644 --- a/.gitignore +++ b/.gitignore @@ -61,4 +61,5 @@ conandeps*.cmake *Config*.cmake *Targets.cmake Find*.cmake -module-*.cmake \ No newline at end of file +module-*.cmake +# CMakeUserPresets.json diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json deleted file mode 100644 index 4b6b288..0000000 --- a/CMakeUserPresets.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 4, - "vendor": { - "conan": {} - }, - "include": [ - "build_Debug/build/Debug/generators/CMakePresets.json", - "build/Release/generators/CMakePresets.json" - ] -} \ No newline at end of file diff --git a/Makefile b/Makefile index 1a2ce7f..29dd0f3 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,12 @@ build: ## Build a debug version of the project cmake --build $(f_debug) -t $(test_targets) $(n_procs) @echo ">>> Done"; +conan-create: ## Create the conan package + @echo ">>> Creating the conan package..." + conan create . --build=missing -tf "" -s:a build_type=Release + conan create . --build=missing -tf "" -s:a build_type=Debug + @echo ">>> Done" + opt = "" test: ## Run tests (opt="-s") to verbose output the tests @echo ">>> Running Folding tests..."; diff --git a/conanfile.py b/conanfile.py index 6207be2..00271ee 100644 --- a/conanfile.py +++ b/conanfile.py @@ -19,13 +19,14 @@ class FoldingConan(ConanFile): generators = "CMakeDeps", "CMakeToolchain" def requirements(self): - self.requires("libtorch/2.7.0") + self.requires("libtorch/2.7.1") def build_requirements(self): self.tool_requires("cmake/[>=3.15]") # Test dependencies self.test_requires("catch2/3.8.1") self.test_requires("arff-files/1.2.0") + self.test_requires("fimdlp/2.1.0") def layout(self): cmake_layout(self)