diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index 6b2b9af75..383071612 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -71,6 +71,8 @@ modules: - openssl - perl - pkgconf + - protobuf + - py-protobuf - qt - randrproto - readline diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index 8011b215f..58fd733c7 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -73,6 +73,8 @@ modules: - openssl - perl - pkgconf + - protobuf + - py-protobuf - qt - randrproto - readline diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index a6618fb4d..3fcce991d 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -12,9 +12,8 @@ yacc: [bison] zlib-api: [zlib-ng] # - # This version of awscli goes with py-pyyaml@5.4.1 - awscli: - version: ['1.27.84'] + awscli-v2: + require: "~examples" bacio: version: ['2.4.1'] bison: @@ -242,6 +241,8 @@ variants: +rust_bootstrap py-shapely: require: ['@1.8.0'] + py-torch: + require: "+internal-protobuf ~mkldnn" qt: version: ['5.15.3'] scotch: diff --git a/configs/sites/derecho/compilers.yaml b/configs/sites/derecho/compilers.yaml index 6ee1668f3..897260905 100644 --- a/configs/sites/derecho/compilers.yaml +++ b/configs/sites/derecho/compilers.yaml @@ -1,42 +1,47 @@ compilers:: - - compiler: - spec: intel@2021.10.0 - paths: - cc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icc - cxx: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icpc - f77: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort - fc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort - flags: {} - operating_system: sles15 - target: x86_64 - modules: - - ncarenv/23.09 - - intel-classic/2023.2.1 - environment: - prepend_path: - PATH: '/opt/cray/pe/gcc/12.2.0/bin' - CPATH: '/opt/cray/pe/gcc/12.2.0/snos/include' - LD_LIBRARY_PATH: '/glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/opt/cray/pe/gcc/12.2.0/snos/lib:/opt/cray/pe/gcc/12.2.0/lib64' - set: - # https://github.com/JCSDA/spack-stack/issues/957 - FI_CXI_RX_MATCH_MODE: 'hybrid' - extra_rpaths: [] - - compiler: - spec: gcc@12.2.0 - paths: - cc: /opt/cray/pe/gcc/12.2.0/bin/gcc - cxx: /opt/cray/pe/gcc/12.2.0/bin/g++ - f77: /opt/cray/pe/gcc/12.2.0/bin/gfortran - fc: /opt/cray/pe/gcc/12.2.0/bin/gfortran - flags: {} - operating_system: sles15 - target: x86_64 - modules: - - ncarenv/23.09 - - gcc/12.2.0 - environment: - set: - # https://github.com/JCSDA/spack-stack/issues/957 - FI_CXI_RX_MATCH_MODE: 'hybrid' +- compiler: + spec: intel@2021.10.0 + paths: + cc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icc + cxx: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/icpc + f77: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort + fc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/bin/intel64/ifort + flags: + cflags: -diag-disable=10441 + cxxflags: -diag-disable=10441 + fflags: -diag-disable=10448 + operating_system: sles15 + target: x86_64 + modules: + - ncarenv/23.09 + - intel-classic/2023.2.1 + environment: + prepend_path: + PATH: '/opt/cray/pe/gcc/12.2.0/bin' + CPATH: '/opt/cray/pe/gcc/12.2.0/snos/include' + LD_LIBRARY_PATH: '/glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/opt/cray/pe/gcc/12.2.0/snos/lib:/opt/cray/pe/gcc/12.2.0/lib64' + set: + # https://github.com/JCSDA/spack-stack/issues/957 + FI_CXI_RX_MATCH_MODE: 'hybrid' + # https://github.com/JCSDA/spack-stack/issues/1012 + I_MPI_EXTRA_FILESYSTEM: 'ON' extra_rpaths: [] +- compiler: + spec: gcc@12.2.0 + paths: + cc: /opt/cray/pe/gcc/12.2.0/bin/gcc + cxx: /opt/cray/pe/gcc/12.2.0/bin/g++ + f77: /opt/cray/pe/gcc/12.2.0/bin/gfortran + fc: /opt/cray/pe/gcc/12.2.0/bin/gfortran + flags: {} + operating_system: sles15 + target: x86_64 + modules: + - ncarenv/23.09 + - gcc/12.2.0 + environment: + set: + # https://github.com/JCSDA/spack-stack/issues/957 + FI_CXI_RX_MATCH_MODE: 'hybrid' + extra_rpaths: [] diff --git a/configs/sites/discover-scu16/compilers.yaml b/configs/sites/discover-scu16/compilers.yaml index 792ab77ab..f763d7ccd 100644 --- a/configs/sites/discover-scu16/compilers.yaml +++ b/configs/sites/discover-scu16/compilers.yaml @@ -6,7 +6,8 @@ compilers: cxx: /usr/local/intel/oneapi/2021/compiler/2022.0.1/linux/bin/intel64/icpc f77: /usr/local/intel/oneapi/2021/compiler/2022.0.1/linux/bin/intel64/ifort fc: /usr/local/intel/oneapi/2021/compiler/2022.0.1/linux/bin/intel64/ifort - flags: {} + flags: + ldflags: '-L/usr/local/other/gcc/11.2.0/lib64' operating_system: sles12 target: x86_64 modules: diff --git a/configs/sites/discover-scu17/compilers.yaml b/configs/sites/discover-scu17/compilers.yaml index b1ef9a4e5..d06415413 100644 --- a/configs/sites/discover-scu17/compilers.yaml +++ b/configs/sites/discover-scu17/compilers.yaml @@ -19,8 +19,9 @@ compilers: PATH: '/usr/local/other/gcc/11.4.0/bin' CPATH: '/usr/local/other/gcc/11.4.0/include' LD_LIBRARY_PATH: '/usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/usr/local/other/gcc/11.4.0/lib64' - #set: - # I_MPI_ROOT: '/usr/local/intel/oneapi/2021/mpi/2021.5.0' + set: + # https://github.com/JCSDA/spack-stack/issues/1012 + I_MPI_EXTRA_FILESYSTEM: 'ON' extra_rpaths: [] - compiler: spec: gcc@=12.3.0 diff --git a/configs/sites/hercules/compilers.yaml b/configs/sites/hercules/compilers.yaml index 36c12beac..45d7077fb 100644 --- a/configs/sites/hercules/compilers.yaml +++ b/configs/sites/hercules/compilers.yaml @@ -6,7 +6,10 @@ compilers: cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort - flags: {} + flags: + cflags: -diag-disable=10441 + cxxflags: -diag-disable=10441 + fflags: -diag-disable=10448 operating_system: rocky9 target: x86_64 modules: diff --git a/configs/sites/noaa-aws/README.md b/configs/sites/noaa-aws/README.md index 254f1db76..c1ec81322 100644 --- a/configs/sites/noaa-aws/README.md +++ b/configs/sites/noaa-aws/README.md @@ -6,6 +6,11 @@ that the site configuration files in `configs/sites/noaa-aws` work out of the bo sudo su chmod 777 /contrib +# The following three commands were necessary to fix failures accessing these repos +yum-config-manager --disable intel-clck-2019-repo +yum-config-manager --disable intel-hpc-platform +yum-config-manager --disable intelpython +# yum install -y qt5-qtbase-devel yum install -y qt5-qtsvg-devel yum install -y xorg-x11-xauth @@ -126,6 +131,7 @@ mkdir ecflow # Create the modulefile from the template in doc/modulefile_templates ############## Steps to perform when starting a new cluster ############## + source /contrib/admin/basic_setup.sh # sudo privileges requred to install packages module unuse /opt/cray/craype/default/modulefiles module unuse /opt/cray/modulefiles @@ -135,3 +141,12 @@ module load ecflow/5.8.4 module load mysql/8.0.31 module load git-lfs/2.4.1 +git lfs install +git config --global credential.helper cache # or store +git config --global user.email "your.name@domain.com" +git config --global user.name "Your Name" + +mkdir ~/.aws +# Create ~/.aws/config +# Create ~/.aws/credentials +chmod 400 ~/.aws/credentials diff --git a/configs/sites/noaa-azure/README.md b/configs/sites/noaa-azure/README.md index 600c61a61..2730e86a9 100644 --- a/configs/sites/noaa-azure/README.md +++ b/configs/sites/noaa-azure/README.md @@ -6,6 +6,11 @@ that the site configuration files in `configs/sites/noaa-azure` work out of the sudo su chmod 777 /contrib +# The following three commands were necessary to fix failures accessing these repos +yum-config-manager --disable intel-clck-2019-repo +yum-config-manager --disable intel-hpc-platform +yum-config-manager --disable intelpython +# yum install -y m4 yum install -y qt5-qtbase-devel yum install -y qt5-qtsvg-devel @@ -130,6 +135,7 @@ mkdir ecflow # Create the modulefile from the template in doc/modulefile_templates ############## Steps to perform when starting a new cluster ############## + source /contrib/admin/basic_setup.sh # sudo privileges requred to install packages module unuse /opt/cray/craype/default/modulefiles module unuse /opt/cray/modulefiles @@ -140,4 +146,12 @@ module load mysql/8.0.31 module load git-lfs/2.4.1 # +git lfs install +git config --global credential.helper cache # or store +git config --global user.email "your.name@domain.com" +git config --global user.name "Your Name" +mkdir ~/.aws +# Create ~/.aws/config +# Create ~/.aws/credentials +chmod 400 ~/.aws/credentials diff --git a/configs/sites/noaa-gcloud/README.md b/configs/sites/noaa-gcloud/README.md index 090a09b1e..a7399c401 100644 --- a/configs/sites/noaa-gcloud/README.md +++ b/configs/sites/noaa-gcloud/README.md @@ -6,6 +6,11 @@ that the site configuration files in `configs/sites/noaa-gcloud` work out of the sudo su chmod 777 /contrib +# The following three commands were necessary to fix failures accessing these repos +yum-config-manager --disable intel-clck-2019-repo +yum-config-manager --disable intel-hpc-platform +yum-config-manager --disable intelpython +# yum install -y qt5-qtbase-devel yum install -y qt5-qtsvg-devel yum install -y xorg-x11-xauth @@ -126,6 +131,7 @@ mkdir ecflow # Create the modulefile from the template in doc/modulefile_templates ############## Steps to perform when starting a new cluster ############## + source /contrib/admin/basic_setup.sh # sudo privileges requred to install packages module unuse /opt/cray/craype/default/modulefiles module unuse /opt/cray/modulefiles @@ -135,3 +141,12 @@ module load ecflow/5.8.4 module load mysql/8.0.31 module load git-lfs/2.4.1 +git lfs install +git config --global credential.helper cache # or store +git config --global user.email "your.name@domain.com" +git config --global user.name "Your Name" + +mkdir ~/.aws +# Create ~/.aws/config +# Create ~/.aws/credentials +chmod 400 ~/.aws/credentials diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 2d9cab3b2..050cbd2d5 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -9,6 +9,7 @@ spack: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel'] - packages: - ewok-env +ecflow +cylc + - ai-env - geos-gcm-env - jedi-fv3-env - jedi-geos-env @@ -30,3 +31,6 @@ spack: - matrix: - [$packages] - [$compilers] + exclude: + # py-torch in ai-env doesn't build with Intel + - ai-env%intel diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index b6491ea83..8f9b0dfde 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -9,6 +9,7 @@ spack: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel'] - packages: - ewok-env +ecflow +cylc + - ai-env - geos-gcm-env - global-workflow-env - gmao-swell-env @@ -40,5 +41,7 @@ spack: - [$packages] - [$compilers] exclude: + # py-torch in ai-env doesn't build with Intel + - ai-env%intel # jedi-tools doesn't build with Intel - jedi-tools-env%intel diff --git a/doc/source/MaintainersSection.rst b/doc/source/MaintainersSection.rst index d981201f3..79cc8e336 100644 --- a/doc/source/MaintainersSection.rst +++ b/doc/source/MaintainersSection.rst @@ -345,14 +345,24 @@ NASA Discover SCU17 On Discover SCU17 ``ecflow`` needs to be installed as a one-off before spack can be used. ecflow - ``ecFlow`` must be built manually using the GNU compilers and linked against a static ``boost`` library. After loading the following modules, follow the instructions in :numref:`Section %s `. + ``ecFlow`` must be built manually using the GNU compilers and linked against a static ``boost`` library. After loading the following modules, follow the instructions in :numref:`Section %s ` (cont'd below). .. code-block:: console module purge - module load comp/gcc/12.3.0 module load cmake/3.28.2 +The following workaround is required after installing ``ecflow`` and creating the modulefile: edit ``path/to/ecflow/bin/ecflow_ui`` and change the last few lines to (i.e. prepend the ``LD_PRELOAD`` command): + +.. code-block:: console + + if [ $ECFLOWUI_BT != "no" ] + then + LD_PRELOAD=/usr/lib64/libstdc++.so.6 catchsegv ${ECFLOWUI_USER_START_CMD} "$exe" + else + LD_PRELOAD=/usr/lib64/libstdc++.so.6 ${ECFLOWUI_USER_START_CMD} "$exe" + fi + .. _MaintainersSection_Narwhal: ------------------------------ diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst index 26bdd6e76..ebe307ce8 100644 --- a/doc/source/PreConfiguredSites.rst +++ b/doc/source/PreConfiguredSites.rst @@ -26,9 +26,9 @@ On selected systems, developmental versions / release candidates are installed t | MSU +----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+ | | Orion | GCC, Intel | ``/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env`` | EPIC / JCSDA | +---------------------+----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+ -| | Discover SCU16 | GCC, Intel | ``/gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-20240207/envs/unified-env-*`` | JCSDA | +| | Discover SCU16 | GCC, Intel | ``/gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-20240228/envs/unified-env-*`` | JCSDA | | NASA +----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+ -| | Discover SCU17 | GCC, Intel | ``/gpfsm/dnb55/projects/p01/s2127/dheinzel/spstmil/envs/unified-env-*`` **TEMP FOR ACCEPTANCE TESTING** | JCSDA | +| | Discover SCU17 | GCC, Intel | ``/gpfsm/dswdev/jcsda/spack-stack/scu17/spack-stack-20240228/envs/unified-env-*`` | JCSDA | +---------------------+----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+ | | Casper | GCC | ``/glade/work/epicufsrt/contrib/spack-stack/casper/spack-stack-1.6.0/envs/unified-env`` | JCSDA / EPIC | | NCAR-Wyoming +----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+ @@ -177,29 +177,26 @@ The following is required for building new spack environments and for using spac module load miniconda/3.9.7 module load ecflow/5.8.4 -For ``spack-stack-20240207`` with Intel, proceed with loading the following modules: +For ``spack-stack-20240228`` with Intel, proceed with loading the following modules: .. code-block:: console - module use /gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-20240207/envs/unified-env-intel-2021.5.0/install/modulefiles/Core + module use /gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-20240228/envs/unified-env-intel-2021.5.0/install/modulefiles/Core module load stack-intel/2021.5.0 module load stack-intel-oneapi-mpi/2021.5.0 module load stack-python/3.10.13 module available -For ``spack-stack-20240207`` with GNU, proceed with loading the following modules: +For ``spack-stack-20240228`` with GNU, proceed with loading the following modules: .. code-block:: console - module use /gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-20240207/envs/unified-env-gcc-12.1.0/install/modulefiles/Core + module use /gpfsm/dswdev/jcsda/spack-stack/scu16/spack-stack-20240228/envs/unified-env-gcc-12.1.0/install/modulefiles/Core module load stack-gcc/12.1.0 module load stack-openmpi/4.1.3 module load stack-python/3.10.13 module available -.. note:: - When using Intel, it may be required to set the environment variable ``LDFLAGS="-L/usr/local/other/gcc/11.2.0/lib64"`` for building applications like JEDI. - ------------------------------ NASA Discover SCU17 ------------------------------ @@ -213,23 +210,21 @@ The following is required for building new spack environments and for using spac module use /discover/swdev/jcsda/spack-stack/scu17/modulefiles module load ecflow/5.11.4 -For ``spack-stack-20240207`` with Intel, load the following modules after loading ecflow: - -**TEMPORARY LOCATIONS FOR ACCEPTANCE TESTING**! +For ``spack-stack-20240228`` with Intel, load the following modules after loading ecflow: .. code-block:: console - module use /gpfsm/dnb55/projects/p01/s2127/dheinzel/spstmil/envs/unified-env-intel-2021.10.0/install/modulefiles/Core + module use /gpfsm/dswdev/jcsda/spack-stack/scu17/spack-stack-20240228/envs/unified-env-intel-2021.10.0/install/modulefiles/Core module load stack-intel/2021.10.0 module load stack-intel-oneapi-mpi/2021.10.0 module load stack-python/3.10.13 module available -For ``spack-stack-20240207`` with GNU, load the following modules after loading ecflow: +For ``spack-stack-20240228`` with GNU, load the following modules after loading ecflow: .. code-block:: console - module use /gpfsm/dnb55/projects/p01/s2127/dheinzel/spstmil/envs/unified-env-gcc-12.3.0/install/modulefiles/Core + module use /gpfsm/dswdev/jcsda/spack-stack/scu17/spack-stack-20240228/envs/unified-env-gcc-12.3.0/install/modulefiles/Core module load stack-gcc/12.3.0 module load stack-openmpi/4.1.6 module load stack-python/3.10.13 diff --git a/spack b/spack index 3839d67d5..643eb3359 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 3839d67d54fe6f67a8a60f983b2114b3894dc702 +Subproject commit 643eb3359248b768fb319208aea0b544d8127c61 diff --git a/spack-ext/repos/spack-stack/packages/ai-env/package.py b/spack-ext/repos/spack-stack/packages/ai-env/package.py new file mode 100644 index 000000000..1d50e0a78 --- /dev/null +++ b/spack-ext/repos/spack-stack/packages/ai-env/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class AiEnv(BundlePackage): + """Development environment for AI/ML applications""" + + # DH* TODO UPDATE FROM INTERNAL TO PUBLIC + homepage = "https://github.com/JCSDA/spack-stack" + git = "https://github.comJCSDA/spack-stack.git" + + maintainers("climbfuji", "srherbener") + + version("1.0.0") + + depends_on("jedi-base-env", type="run") + depends_on("py-torch", type="run") + + # There is no need for install() since there is no code. diff --git a/spack-ext/repos/spack-stack/packages/ewok-env/package.py b/spack-ext/repos/spack-stack/packages/ewok-env/package.py index a9cb23b26..f4d494132 100644 --- a/spack-ext/repos/spack-stack/packages/ewok-env/package.py +++ b/spack-ext/repos/spack-stack/packages/ewok-env/package.py @@ -37,7 +37,7 @@ class EwokEnv(BundlePackage): description="Build EWOK (Experiments and Workflows Orchestration Kit)", ) - depends_on("jedi-base-env +python", type="run") + depends_on("jedi-base-env", type="run") depends_on("awscli-v2", type="run") depends_on("py-boto3", type="run") depends_on("py-cartopy", type="run") @@ -67,9 +67,4 @@ class EwokEnv(BundlePackage): depends_on("r2d2", when="+r2d2", type="run") depends_on("ewok", when="+ewok", type="run") - conflicts( - "%gcc platform=darwin", - msg="ewok-env does " + "not build with gcc on macOS, use apple-clang", - ) - # There is no need for install() since there is no code. diff --git a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py index 4afc07686..31824eb8d 100644 --- a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py +++ b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py @@ -18,7 +18,7 @@ class GmaoSwellEnv(BundlePackage): version("1.0.0") # Main JEDI modules - depends_on("jedi-base-env +python", type="run") + depends_on("jedi-base-env", type="run") # Add CRTM 2.4.0 depends_on("crtm@v2.4-jedi.2", type="run") diff --git a/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py b/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py index 2e8b1b291..01774834c 100644 --- a/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py +++ b/spack-ext/repos/spack-stack/packages/jedi-base-env/package.py @@ -20,7 +20,6 @@ class JediBaseEnv(BundlePackage): # Need to find a free fftw provider for fftw-api ... variant("fftw", default=True, description="Build fftw") variant("hdf4", default=True, description="Build hdf4 library and python hdf module") - variant("python", default=True, description="Build Python libraries") depends_on("base-env", type="run") depends_on("bison", type="run") @@ -50,18 +49,23 @@ class JediBaseEnv(BundlePackage): depends_on("sp", type="run") depends_on("udunits", type="run") - with when("+python"): - depends_on("py-eccodes", type="run") - depends_on("py-f90nml", type="run") - depends_on("py-h5py", type="run") - depends_on("py-netcdf4", type="run") - depends_on("py-pandas", type="run") - depends_on("py-pycodestyle", type="run") - depends_on("py-pybind11", type="run") - depends_on("py-pyhdf", when="+hdf4", type="run") - depends_on("py-python-dateutil", type="run") - depends_on("py-pyyaml", type="run") - depends_on("py-scipy", type="run") - depends_on("py-xarray", type="run") + # Python packages + depends_on("py-eccodes", type="run") + depends_on("py-f90nml", type="run") + depends_on("py-h5py", type="run") + depends_on("py-netcdf4", type="run") + depends_on("py-pandas", type="run") + depends_on("py-pycodestyle", type="run") + depends_on("py-pybind11", type="run") + depends_on("py-pyhdf", when="+hdf4", type="run") + depends_on("py-python-dateutil", type="run") + depends_on("py-pyyaml", type="run") + depends_on("py-scipy", type="run") + depends_on("py-xarray", type="run") + + conflicts( + "%gcc platform=darwin", + msg="jedi-base-env does not build with gcc on macOS, use apple-clang", + ) # There is no need for install() since there is no code. diff --git a/util/util_tests.sh b/util/util_tests.sh index 1ba1fbd1a..079c20f92 100755 --- a/util/util_tests.sh +++ b/util/util_tests.sh @@ -80,7 +80,6 @@ fi ## Check check_package_config.py export SPACK_ENV=${SPACK_STACK_DIR}/util/test_env -### NOT NEEDED I THINK export SPACK_ROOT=${SPACK_STACK_DIR}/spack ${SPACK_STACK_DIR}/util/check_package_config.py ${SPACK_STACK_DIR}/util/check_package_config.py | sort ${SPACK_STACK_DIR}/util/check_package_config.py | sort | md5sum