Skip to content

Commit f898ade

Browse files
mkandesmkandes
committed
Rebuilt expanse/0.17.2/cpu to use ~ilp64 by default for all packages
1 parent 6910c64 commit f898ade

File tree

380 files changed

+787
-903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+787
-903
lines changed

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16
@@ -36,7 +36,7 @@ module list
3636

3737
declare -xr SPACK_PACKAGE='[email protected]'
3838
declare -xr SPACK_COMPILER='[email protected]'
39-
declare -xr SPACK_VARIANTS='+blas +cblas +ilp64 +shared +static threads=openmp'
39+
declare -xr SPACK_VARIANTS='+blas +cblas ~ilp64 +shared +static threads=openmp'
4040
declare -xr SPACK_DEPENDENCIES=''
4141
declare -xr SPACK_SPEC="${SPACK_PACKAGE} % ${SPACK_COMPILER} ${SPACK_VARIANTS}"
4242

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16
99
#SBATCH --mem=32G
10-
#SBATCH --time=00:30:00
10+
#SBATCH --time=01:00:00
1111
#SBATCH --output=%x.o%j.%N
1212

1313
declare -xr LOCAL_TIME="$(date +'%Y%m%dT%H%M%S%z')"
@@ -36,7 +36,7 @@ module list
3636

3737
declare -xr SPACK_PACKAGE='[email protected]'
3838
declare -xr SPACK_COMPILER='[email protected]'
39-
declare -xr SPACK_VARIANTS='+blas +cblas +ilp64 +shared +static threads=none'
39+
declare -xr SPACK_VARIANTS='+blas +cblas ~ilp64 +shared +static threads=none'
4040
declare -xr SPACK_DEPENDENCIES=''
4141
declare -xr SPACK_SPEC="${SPACK_PACKAGE} % ${SPACK_COMPILER} ${SPACK_VARIANTS}"
4242

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16
@@ -34,7 +34,7 @@ module load "${SCHEDULER_MODULE}"
3434
module list
3535
. "${SPACK_INSTANCE_DIR}/share/spack/setup-env.sh"
3636

37-
#==> Error: [email protected]%[email protected]~debug+ilp64+lapack2flame+shared+static threads=openmp is unsatisfiable, conflicts are:
37+
#==> Error: [email protected]%[email protected]~debug~ilp64+lapack2flame+shared+static threads=openmp is unsatisfiable, conflicts are:
3838
# A conflict was triggered
3939
# condition(28)
4040
# condition(33)
@@ -46,12 +46,12 @@ module list
4646
#
4747
#Input spec
4848
#--------------------------------
49-
#[email protected]%[email protected]~debug+ilp64+lapack2flame+shared+static threads=openmp
49+
#[email protected]%[email protected]~debug~ilp64+lapack2flame+shared+static threads=openmp
5050

5151
declare -xr SPACK_PACKAGE='[email protected]'
5252
declare -xr SPACK_COMPILER='[email protected]'
53-
declare -xr SPACK_VARIANTS='~debug +ilp64 +lapack2flame +shared +static' #threads=none'
54-
declare -xr SPACK_DEPENDENCIES="^[email protected]/$(spack find --format '{hash:7}' [email protected] % ${SPACK_COMPILER} +ilp64 threads=openmp)"
53+
declare -xr SPACK_VARIANTS='~debug ~ilp64 +lapack2flame +shared +static' #threads=none'
54+
declare -xr SPACK_DEPENDENCIES="^[email protected]/$(spack find --format '{hash:7}' [email protected] % ${SPACK_COMPILER} ~ilp64 threads=openmp)"
5555
declare -xr SPACK_SPEC="${SPACK_PACKAGE} % ${SPACK_COMPILER} ${SPACK_VARIANTS} ${SPACK_DEPENDENCIES}"
5656

5757
printenv

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16
@@ -34,7 +34,7 @@ module load "${SCHEDULER_MODULE}"
3434
module list
3535
. "${SPACK_INSTANCE_DIR}/share/spack/setup-env.sh"
3636

37-
#==> Error: [email protected]%[email protected]~debug+ilp64+lapack2flame+shared+static threads=openmp is unsatisfiable, conflicts are:
37+
#==> Error: [email protected]%[email protected]~debug~ilp64+lapack2flame+shared+static threads=openmp is unsatisfiable, conflicts are:
3838
# A conflict was triggered
3939
# condition(28)
4040
# condition(33)
@@ -46,12 +46,12 @@ module list
4646
#
4747
#Input spec
4848
#--------------------------------
49-
#[email protected]%[email protected]~debug+ilp64+lapack2flame+shared+static threads=openmp
49+
#[email protected]%[email protected]~debug~ilp64+lapack2flame+shared+static threads=openmp
5050

5151
declare -xr SPACK_PACKAGE='[email protected]'
5252
declare -xr SPACK_COMPILER='[email protected]'
53-
declare -xr SPACK_VARIANTS='~debug +ilp64 +lapack2flame +shared +static' #threads=none'
54-
declare -xr SPACK_DEPENDENCIES="^[email protected]/$(spack find --format '{hash:7}' [email protected] % ${SPACK_COMPILER} +ilp64 threads=none)"
53+
declare -xr SPACK_VARIANTS='~debug ~ilp64 +lapack2flame +shared +static' #threads=none'
54+
declare -xr SPACK_DEPENDENCIES="^[email protected]/$(spack find --format '{hash:7}' [email protected] % ${SPACK_COMPILER} ~ilp64 threads=none)"
5555
declare -xr SPACK_SPEC="${SPACK_PACKAGE} % ${SPACK_COMPILER} ${SPACK_VARIANTS} ${SPACK_DEPENDENCIES}"
5656

5757
printenv

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16

‎etc/spack/sdsc/expanse/0.17.2/cpu/specs/[email protected]/[email protected]‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#SBATCH [email protected]
44
#SBATCH --account=use300
5-
#SBATCH --partition=shared
5+
#SBATCH --partition=ind-shared
66
#SBATCH --nodes=1
77
#SBATCH --ntasks-per-node=1
88
#SBATCH --cpus-per-task=16
@@ -36,7 +36,7 @@ module list
3636

3737
declare -xr SPACK_PACKAGE='[email protected]'
3838
declare -xr SPACK_COMPILER='[email protected]'
39-
declare -xr SPACK_VARIANTS='+ilp64 ~ipo +shared'
39+
declare -xr SPACK_VARIANTS='~ilp64 ~ipo +shared'
4040
declare -xr SPACK_DEPENDENCIES=''
4141
declare -xr SPACK_SPEC="${SPACK_PACKAGE} % ${SPACK_COMPILER} ${SPACK_VARIANTS}"
4242

0 commit comments

Comments
 (0)