Skip to content
Merged
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
42 changes: 0 additions & 42 deletions configs/sites/tier1/narwhal/packages_gcc-12.2.0.yaml

This file was deleted.

40 changes: 40 additions & 0 deletions configs/sites/tier1/narwhal/packages_gcc-13.3.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
packages:
all:
require:
- any_of: ['%gcc@=13.3.0']
when: '%gcc'
mpi:
buildable: false
require:
- cray-mpich@8.1.30
gcc:
buildable: false
externals:
- spec: gcc@13.3.0 languages:='c,c++,fortran'
prefix: /usr
modules:
- PrgEnv-gnu/8.5.0
- gcc-native/13.2
extra_attributes:
compilers:
c: /usr/bin/gcc-13
cxx: /usr/bin/g++-13
fortran: /usr/bin/gfortran-13
environment:
set:
CONFIG_SITE: ''
PE_GCC_EXTERNAL: native
extra_rpaths:
- /opt/cray/libfabric/1.22.0/lib64
cray-mpich:
buildable: false
externals:
- spec: cray-mpich@8.1.30
prefix: /opt/cray/pe/mpich/8.1.30/ofi/gnu/12.3
modules:
- craype-network-ofi
- cray-mpich/8.1.30
- libfabric/1.22.0
extra_attributes:
extra_rpaths:
- /opt/cray/libfabric/1.22.0/lib64
39 changes: 15 additions & 24 deletions configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ packages:
require:
- any_of: ['%intel-oneapi-compilers@=2024.2.0']
when: '%intel-oneapi-compilers'
- any_of: ['%gcc@=12.2.0']
- any_of: ['%gcc@=13.3.0']
when: '%gcc'
mpi:
buildable: false
require:
- cray-mpich@8.1.26
- cray-mpich@8.1.30
intel-oneapi-compilers:
buildable: false
externals:
- spec: intel-oneapi-compilers@2024.2.0
prefix: /opt/intel/oneapi_2024.2.0.634
modules:
- PrgEnv-intel/8.4.0
- PrgEnv-intel/8.5.0
- intel-oneapi/2024.2
extra_attributes:
compilers:
Expand All @@ -27,46 +27,37 @@ packages:
CONFIG_SITE: ''
# Force ifort not ifx
INTEL_COMPILER_TYPE: 'RECOMMENDED'
prepend_path:
PATH: /opt/cray/pe/gcc/12.2.0/snos/bin
CPATH: /opt/cray/pe/gcc/12.2.0/snos/include
extra_rpaths:
- /opt/cray/libfabric/1.22.0/lib64
- /opt/cray/pe/gcc/12.2.0/snos/lib64
- /opt/cray/pe/gcc/12.2.0/snos/lib
gcc:
buildable: false
externals:
- spec: gcc@12.2.0 languages:='c,c++'
prefix: /opt/cray/pe/gcc/12.2.0/snos
- spec: gcc@13.3.0 languages:='c,c++,fortran'
prefix: /usr
modules:
- PrgEnv-gnu/8.4.0
- gcc/12.2.0
- PrgEnv-gnu/8.5.0
- gcc-native/13.2
extra_attributes:
compilers:
c: /opt/cray/pe/gcc/12.2.0/snos/bin/gcc
cxx: /opt/cray/pe/gcc/12.2.0/snos/bin/g++
fortran: /opt/cray/pe/gcc/12.2.0/snos/bin/gfortran
c: /usr/bin/gcc-13
cxx: /usr/bin/g++-13
fortran: /usr/bin/gfortran-13
environment:
set:
CONFIG_SITE: ''
PE_GCC_EXTERNAL: native
extra_rpaths:
- /opt/cray/libfabric/1.22.0/lib64
- /opt/cray/pe/gcc/12.2.0/snos/lib64
- /opt/cray/pe/gcc/12.2.0/snos/lib
cray-mpich:
buildable: false
externals:
- spec: cray-mpich@8.1.26
prefix: /opt/cray/pe/mpich/8.1.26/ofi/intel/2022.1
- spec: cray-mpich@8.1.30
prefix: /opt/cray/pe/mpich/8.1.30/ofi/intel/2022.1
modules:
- craype-network-ucx
- cray-mpich-ucx/8.1.26
- craype-network-ofi
- cray-mpich/8.1.30
- libfabric/1.22.0
extra_attributes:
extra_rpaths:
- /opt/cray/libfabric/1.22.0/lib64
# - /opt/cray/pe/mpich/8.1.26/ofi/intel/2022.1/lib
intel-oneapi-mkl:
buildable: false
externals:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AdpPreprocessors(MakefilePackage):
#license("UNKNOWN", checked_by="github_user1")

# Update commit once 1.2.0 is released
version("1.2.0", commit="87e93306de9df9ff4d02bce84249976cfa2f4c97")
version("1.2.0", commit="c6f15e46496309c3893416ba4ccec7f003b93550")
version("1.1.0", commit="b2d9d4ffb472eff9ab973ef2a12f574d92c9754b")

# MakefilePackage dependencies
Expand Down