From d71fff9b13cd0667e1c5a8d535e583dc0b31f1d1 Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Mon, 27 Nov 2023 17:43:39 +0100 Subject: [PATCH 1/3] Simplify a few CMakePackages by removing redundant directives (#41163) Co-authored-by: jmcarcell --- var/spack/repos/builtin/packages/crtm/package.py | 7 ------- var/spack/repos/builtin/packages/draco/package.py | 6 ------ var/spack/repos/builtin/packages/libtree/package.py | 6 ------ 3 files changed, 19 deletions(-) diff --git a/var/spack/repos/builtin/packages/crtm/package.py b/var/spack/repos/builtin/packages/crtm/package.py index 65c4afdc383751..608a6aa30d5ae4 100644 --- a/var/spack/repos/builtin/packages/crtm/package.py +++ b/var/spack/repos/builtin/packages/crtm/package.py @@ -27,13 +27,6 @@ class Crtm(CMakePackage): variant( "fix", default=False, description='Download CRTM coeffecient or "fix" files (several GBs).' ) - variant( - "build_type", - default="RelWithDebInfo", - description="CMake build type", - values=("Debug", "Release", "RelWithDebInfo", "MinSizeRel"), - ) - depends_on("cmake@3.15:", type="build") depends_on("git-lfs") depends_on("netcdf-fortran", when="@2.4.0:") diff --git a/var/spack/repos/builtin/packages/draco/package.py b/var/spack/repos/builtin/packages/draco/package.py index c81c124257acb6..dbe118e550f871 100644 --- a/var/spack/repos/builtin/packages/draco/package.py +++ b/var/spack/repos/builtin/packages/draco/package.py @@ -41,12 +41,6 @@ class Draco(CMakePackage): version("6.20.1", sha256="b1c51000c9557e0818014713fce70d681869c50ed9c4548dcfb2e9219c354ebe") version("6.20.0", sha256="a6e3142c1c90b09c4ff8057bfee974369b815122b01d1f7b57888dcb9b1128f6") - variant( - "build_type", - default="Release", - description="CMake build type", - values=("Debug", "Release", "RelWithDebInfo", "MinSizeRel"), - ) variant("caliper", default=False, description="Enable caliper timers support") variant("cuda", default=False, description="Enable Cuda/GPU support") variant("eospac", default=True, description="Enable EOSPAC support") diff --git a/var/spack/repos/builtin/packages/libtree/package.py b/var/spack/repos/builtin/packages/libtree/package.py index 8cc847ae1f81e5..d79243c45899bb 100644 --- a/var/spack/repos/builtin/packages/libtree/package.py +++ b/var/spack/repos/builtin/packages/libtree/package.py @@ -54,12 +54,6 @@ def url_for_version(self, version): with when("build_system=cmake"): variant("chrpath", default=False, description="Use chrpath for deployment") variant("strip", default=False, description="Use binutils strip for deployment") - variant( - "build_type", - default="RelWithDebInfo", - description="CMake build type", - values=("Debug", "Release", "RelWithDebInfo", "MinSizeRel"), - ) depends_on("googletest", type="test") depends_on("cmake@3:", type="build") depends_on("chrpath", when="+chrpath", type="run") From da539463828f00e3d2fc5f2cddcd178e2d149bf0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 29 Dec 2023 09:19:50 -0700 Subject: [PATCH 2/3] Bug fix in py-gevent to build with intel/oneapi compilers --- var/spack/repos/builtin/packages/py-gevent/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py index 7216c0c6d6dde2..8b10c1749fcb66 100644 --- a/var/spack/repos/builtin/packages/py-gevent/package.py +++ b/var/spack/repos/builtin/packages/py-gevent/package.py @@ -54,4 +54,6 @@ def flag_handler(self, name, flags): if name == "cflags": if self.spec.satisfies("%oneapi@2023:"): flags.append("-Wno-error=incompatible-function-pointer-types") + if self.spec.compiler.name in ["intel", "oneapi"]: + flags.append("-we147") return (flags, None, None) From 5edc09a67550370c718a3feca17f93ac3d1189e3 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 3 Jan 2024 19:28:36 -0700 Subject: [PATCH 3/3] Repair share/spack/templates/container/Dockerfile: put extra instructions for build and final phase back in --- share/spack/templates/container/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile index 213302876c15f3..ee9ad6ffae03be 100644 --- a/share/spack/templates/container/Dockerfile +++ b/share/spack/templates/container/Dockerfile @@ -43,6 +43,9 @@ RUN find -L {{ paths.view }}/* -type f -exec readlink -f '{}' \; | \ RUN cd {{ paths.environment }} && \ spack env activate --sh -d . > activate.sh +{% if extra_instructions.build %} +{{ extra_instructions.build }} +{% endif %} {% endblock build_stage %} {% endif %} @@ -75,6 +78,10 @@ RUN {% if os_package_update %}{{ os_packages_final.update }} \ && {% endif %}{{ os_packages_final.install }} {{ os_packages_final.list | join | replace('\n', ' ') }} \ && {{ os_packages_final.clean }} {% endif %} +{% if extra_instructions.final %} + +{{ extra_instructions.final }} +{% endif %} {% endblock final_stage %} {% for label, value in labels.items() %} LABEL "{{ label }}"="{{ value }}"