diff options
| author | Chris White <white238@llnl.gov> | 2023-05-15 13:21:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 13:21:37 -0700 |
| commit | d97ecfe147a9d2aa263b827745f32f45fa3163bb (patch) | |
| tree | 1892970991d6984f928723cadadd2966437512ff | |
| parent | 0d991de50af99c9938b3c376cea44cd4656f336e (diff) | |
| download | spack-d97ecfe147a9d2aa263b827745f32f45fa3163bb.tar.gz spack-d97ecfe147a9d2aa263b827745f32f45fa3163bb.tar.bz2 spack-d97ecfe147a9d2aa263b827745f32f45fa3163bb.tar.xz spack-d97ecfe147a9d2aa263b827745f32f45fa3163bb.zip | |
SUNDIALS: new version of sundials and guard against examples being install (#37576)
* add new version of sundials and guard against examples not installing
* fix flipping of variant
* fix directory not being there when writing a file
| -rw-r--r-- | var/spack/repos/builtin/packages/sundials/package.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 0d41344a8d..2fc0604d56 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -27,6 +27,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): # Versions # ========================================================================== version("develop", branch="develop") + version("6.5.1", sha256="4252303805171e4dbdd19a01e52c1dcfe0dafc599c3cfedb0a5c2ffb045a8a75") version("6.5.0", sha256="4e0b998dff292a2617e179609b539b511eb80836f5faacf800e688a886288502") version("6.4.1", sha256="7bf10a8d2920591af3fba2db92548e91ad60eb7241ab23350a9b1bc51e05e8d0") version("6.4.0", sha256="0aff803a12c6d298d05b56839197dd09858631864017e255ed89e28b49b652f1") @@ -773,6 +774,8 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): """(Hack) Set/get cmake dependency path.""" filepath = join_path(self.install_test_root, "cmake_bin_path.txt") if set: + if not os.path.exists(self.install_test_root): + mkdirp(self.install_test_root) with open(filepath, "w") as out_file: cmake_bin = join_path(self.spec["cmake"].prefix.bin, "cmake") out_file.write("{0}\n".format(cmake_bin)) @@ -782,7 +785,8 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): @run_after("install") def setup_smoke_tests(self): - install_tree(self._smoke_tests_path, join_path(self.install_test_root, "testing")) + if "+examples-install" in self.spec: + install_tree(self._smoke_tests_path, join_path(self.install_test_root, "testing")) self.cmake_bin(set=True) def build_smoke_tests(self): @@ -792,6 +796,10 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): tty.msg("Skipping sundials test: cmake_bin_path.txt not found") return + if "~examples-install" in self.spec: + tty.msg("Skipping sundials test: examples were not installed") + return + for smoke_test in self._smoke_tests: work_dir = join_path(self._smoke_tests_path, os.path.dirname(smoke_test[0])) with working_dir(work_dir): @@ -800,6 +808,9 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): self.run_test(exe="make") def run_smoke_tests(self): + if "~examples-install" in self.spec: + return + for smoke_test in self._smoke_tests: self.run_test( exe=join_path(self._smoke_tests_path, smoke_test[0]), @@ -811,6 +822,9 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): ) def clean_smoke_tests(self): + if "~examples-install" in self.spec: + return + for smoke_test in self._smoke_tests: work_dir = join_path(self._smoke_tests_path, os.path.dirname(smoke_test[0])) with working_dir(work_dir): |