Skip to content

Commit 9c59814

Browse files
author
Cameron Rutherford
authored
Add Spack CPU build with exago+hiop+raja~ipopt ^hiop+raja~sparse (#41)
* Add CPU build with hiop+sparse and exago~ipopt+hiop+raja * Update .github/workflows/spack_cpu_build.yaml * `+mpi` to `+raja` CPU build * Add HIOPRAJASPARSE model if sparse and raja enabled * Fix other HIOPRAJASPARSE ifdef
1 parent ea2f3cb commit 9c59814

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/spack_cpu_build.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,29 @@ jobs:
1111
container: spack/ubuntu-focal:latest
1212
strategy:
1313
matrix:
14+
# Minimal Build(s)
15+
# Need S3 mirror to have these builds speedup
1416
spack_spec:
15-
# Minimal Build(s)
1617
# See #39 - ~python~mpi causes issues
1718
# - exago@develop~mpi~ipopt~hiop~python~raja
19+
# See #44 - +mpi~python should fail if no python in system,
20+
# but the runner happens to have one...
1821
- exago@develop+mpi~ipopt+hiop~python~raja ^openmpi
1922
# See #18 - +hiop~mpi causes issues
2023
# - exago@develop~mpi~ipopt+hiop~python+raja
2124
# See #16 - +python~mpi causes issues
2225
# - exago@develop~mpi~ipopt+hiop+python~raja
2326
- exago@develop+mpi~ipopt+hiop+python~raja ^openmpi
27+
# See #40 - +hiop+raja~ipopt ^hiop~sparse is useful for edge cases
28+
- exago@develop+mpi~ipopt+hiop~python+raja ^openmpi ^hiop+raja~sparse
2429

2530
name: Build ExaGO with Spack
2631
steps:
2732
- name: Checkout
2833
uses: actions/checkout@v2
2934
with:
30-
# Once we move submodule deps into spack, we can do some more builds...
35+
# Once we move submodule deps into spack, we can do some more builds
36+
# Also need to change build script to use spack from base image
3137
submodules: true
3238

3339
- name: Build Environment

src/opflow/interface/opflowregi.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ extern PetscErrorCode OPFLOWModelCreate_PBPOLHIOP(OPFLOW);
7676

7777
#if defined(EXAGO_ENABLE_RAJA)
7878
extern PetscErrorCode OPFLOWModelCreate_PBPOLRAJAHIOP(OPFLOW);
79+
#if defined(EXAGO_ENABLE_HIOP_SPARSE)
7980
extern PetscErrorCode OPFLOWModelCreate_PBPOLRAJAHIOPSPARSE(OPFLOW);
8081
#endif
82+
#endif
8183

8284
/*
8385
OPFLOWModelRegisterAll - Registers all built OPFLOW models
@@ -115,9 +117,11 @@ PetscErrorCode OPFLOWModelRegisterAll(OPFLOW opflow) {
115117
ierr = OPFLOWModelRegister(opflow, OPFLOWMODEL_PBPOLRAJAHIOP,
116118
OPFLOWModelCreate_PBPOLRAJAHIOP);
117119
CHKERRQ(ierr);
120+
#if defined(EXAGO_ENABLE_HIOP_SPARSE)
118121
ierr = OPFLOWModelRegister(opflow, OPFLOWMODEL_PBPOLRAJAHIOPSPARSE,
119122
OPFLOWModelCreate_PBPOLRAJAHIOPSPARSE);
120123
CHKERRQ(ierr);
124+
#endif
121125
#endif
122126

123127
opflow->OPFLOWModelRegisterAllCalled = PETSC_TRUE;

0 commit comments

Comments
 (0)