Skip to content

Commit 741ce9a

Browse files
author
Rutherford, Cameron
committed
Force python rebuild on ascent and use [email protected] on incline [ascent-rebuild] [newell-rebuild] [incline-rebuild]
1 parent 1638299 commit 741ce9a

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Diff for: buildsystem/spack/ascent/spack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ spack:
55
view: false
66
concretizer:
77
unify: when_possible
8-
reuse: true
8+
reuse: false
99
config:
1010
concretizer: clingo
1111
install_tree:

Diff for: buildsystem/spack/incline/sbatch.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ export MY_CLUSTER=incline
4646
cp /qfs/projects/exasgd/src/coinhsl-archive-2019.05.21.tar.gz . &&
4747
. buildsystem/spack/load_spack.sh &&
4848
spack develop --no-clone --path=$(pwd) exago@develop &&
49-
spack develop --clone --force FORCE --path=$(pwd)/hiop hiop@develop &&
50-
cd $(pwd)/hiop &&
51-
git submodule update --init --recursive &&
52-
cd - &&
49+
# spack develop --clone --force FORCE --path=$(pwd)/hiop hiop@develop &&
50+
# cd $(pwd)/hiop &&
51+
# git submodule update --init --recursive &&
52+
# cd - &&
5353
buildsystem/spack/configure_modules.sh 24
5454

5555
EXIT_CODE=$?

Diff for: buildsystem/spack/incline/spack.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ spack:
33
- exago@develop%[email protected] amdgpu_target=gfx908
44
view: false
55
concretizer:
6+
unify: when_possible
67
reuse: false
78
config:
89
install_tree:
@@ -55,7 +56,8 @@ spack:
5556
require: ~python+raja+hiop+rocm+ipopt
5657
hiop:
5758
# TODO - build with Ginkgo #463
58-
require: '@develop+sparse+mpi+raja+rocm~ginkgo+kron'
59+
# TODO - updgrade to develop / 1.0.0
60+
require: '@0.7.2+sparse+mpi+raja+rocm~ginkgo+kron'
5961
ipopt:
6062
require: '@3.12.10~metis+coinhsl~mumps'
6163
# Pin version of OpenBlas for testing results

0 commit comments

Comments
 (0)