Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: upgrade to gcc11 #29

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildsystem/spack/deception/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ module load python/miniconda3.9
source /share/apps/python/miniconda3.9/etc/profile.d/conda.sh

# Load system modules
module load gcc/9.1.0
module load cuda/11.4
module load gcc/11.2.0
module load cuda/11.8
Comment on lines +11 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully we don't need specifically 11.3.0... If we need to switch to that, seems like we would also have to downgrade to CUDA 11.7...

module load openmpi/4.1.0mlx5.0

# Define environment variables for where spack stores key files
Expand Down
33 changes: 10 additions & 23 deletions buildsystem/spack/deception/spack.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
spack:
specs:
- exago@develop+cuda%gcc@9.1.0 cuda_arch=60,70,75,80
- exago@develop+cuda%gcc@11.2.0 cuda_arch=60,70,75,80
view: false
concretizer:
reuse: false
Expand Down Expand Up @@ -48,13 +48,13 @@ spack:
externals:
- spec: [email protected]
modules:
- cmake/3.26.3
- cmake/3.26.3
buildable: false
git:
externals:
- spec: [email protected]
modules:
- git/2.37.3
- git/2.37.3
prefix: /share/apps/git/2.37.3
buildable: false
perl:
Expand All @@ -72,31 +72,18 @@ spack:
buildable: false
cuda:
externals:
- spec: cuda@11.4
- spec: cuda@11.8
modules:
- cuda/11.4
- cuda/11.8
buildable: false
compilers:
- compiler:
spec: gcc@7.3.0
spec: gcc@=11.2.0
paths:
cc: /share/apps/gcc/7.3.0/bin/gcc
cxx: /share/apps/gcc/7.3.0/bin/g++
f77: /share/apps/gcc/7.3.0/bin/gfortran
fc: /share/apps/gcc/7.3.0/bin/gfortran
flags: {}
operating_system: centos7
target: x86_64
modules: []
environment: {}
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: /share/apps/gcc/9.1.0/bin/gcc
cxx: /share/apps/gcc/9.1.0/bin/g++
f77: /share/apps/gcc/9.1.0/bin/gfortran
fc: /share/apps/gcc/9.1.0/bin/gfortran
cc: /share/apps/gcc/11.2.0/bin/gcc
cxx: /share/apps/gcc/11.2.0/bin/g++
f77: /share/apps/gcc/11.2.0/bin/gfortran
fc: /share/apps/gcc/11.2.0/bin/gfortran
flags: {}
operating_system: centos7
target: x86_64
Expand Down
2 changes: 1 addition & 1 deletion buildsystem/spack/newell/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module load python/miniconda3.8
. /share/apps/python/miniconda3.8/etc/profile.d/conda.sh

# Load compiler/system modules
module load gcc/8.5.0
module load gcc/11.2.0
module load cuda/11.4
module load openmpi/4.1.4

Expand Down
16 changes: 8 additions & 8 deletions buildsystem/spack/newell/spack.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
spack:
specs:
- exago@develop+cuda%gcc@8.5.0 cuda_arch=70
- exago@develop+cuda%gcc@11.2.0 cuda_arch=70
view: false
concretizer:
reuse: false
Expand Down Expand Up @@ -44,10 +44,10 @@ spack:
- openmpi
openmpi:
externals:
- spec: [email protected]%gcc@8.5.0
- spec: [email protected]%gcc@11.2.0
modules:
- openmpi/4.1.4
prefix: /share/apps/openmpi/4.1.4/gcc/8.5.0
prefix: /share/apps/openmpi/4.1.4/gcc/11.2.0
buildable: false
cuda:
externals:
Expand All @@ -57,12 +57,12 @@ spack:
buildable: false
compilers:
- compiler:
spec: gcc@8.5.0
spec: gcc@=11.2.0
paths:
cc: /usr/bin/gcc
cxx: /usr/bin/g++
f77: /usr/bin/gfortran
fc: /usr/bin/gfortran
cc: /share/apps/gcc/11.2.0/bin/gcc
cxx: /share/apps/gcc/11.2.0/bin/g++
f77: /share/apps/gcc/11.2.0/bin/gfortran
fc: /share/apps/gcc/11.2.0/bin/gfortran
flags: {}
operating_system: centos8
target: ppc64le
Expand Down
2 changes: 1 addition & 1 deletion tpl/spack
Submodule spack updated 4418 files