Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1015 commits
Select commit Hold shift + click to select a range
34b247d
Merge branch 'develop' into feature/yang39/signed-dist-gpu
publixsubfan Sep 14, 2021
45061ef
Test if signed_distance_set_execution_space fails after init
publixsubfan Sep 14, 2021
6f3e261
Document some internal functions/types
publixsubfan Sep 14, 2021
a84cd12
Rename getIterator() to getTraverser() for consistency
publixsubfan Sep 14, 2021
5e7f4c7
Add documentation to getTraverser() function
publixsubfan Sep 14, 2021
a71279c
Update release notes
publixsubfan Sep 14, 2021
67b8200
Merge pull request #647 from LLNL/feature/yang39/signed-dist-gpu
publixsubfan Sep 14, 2021
6b8722d
Merge branch 'develop' into v0.6.0-RC
rhornung67 Sep 16, 2021
b06f638
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Sep 16, 2021
87ce558
Address some reviewer comments and attempt to expose more things in d…
rhornung67 Sep 16, 2021
3779190
Add and fix links.
rhornung67 Sep 16, 2021
fb2dc88
Add links to array class documentation for API details.
rhornung67 Sep 16, 2021
5b3835f
Address more reviewer comments.
rhornung67 Sep 16, 2021
a3ce91f
Addressed more reviewer comments.
rhornung67 Sep 16, 2021
08bf10a
BVH: Use distance to child bounding boxes as heuristic for traversal
publixsubfan Sep 17, 2021
f624ddf
Clarify documentation for traversal function
publixsubfan Sep 20, 2021
18a1dcc
Merge pull request #652 from LLNL/feature/yang39/bvh-traverse-heuristic
publixsubfan Sep 20, 2021
c483b43
remove member variable because it isnt used in this class but is cont…
white238 Sep 20, 2021
77a5556
Merge pull request #654 from LLNL/bugfix/white238/inlet_warning
white238 Sep 21, 2021
79ce5d3
fix: defer element orientation checks until after GF set
joshessman-llnl Aug 31, 2021
4c7b966
refactor: reorder mesh setup
joshessman-llnl Sep 2, 2021
e95a8fc
docs: add @kennyweiss suggestions
joshessman-llnl Sep 13, 2021
c693696
Add support to SignedDistance for specifying allocator id
publixsubfan Sep 14, 2021
dae8636
Don't clobber global allocator value in C interface
publixsubfan Sep 16, 2021
5b1bf10
Fix memory leak
publixsubfan Sep 16, 2021
8ca4e4a
Fix performance regression in quest_signed_distance_interface_ex
publixsubfan Sep 17, 2021
841b31c
Remove obsoleted arguments from SignedDistance interface
publixsubfan Sep 21, 2021
187c138
Remove max levels/occupancy settings from signed distance C interface
publixsubfan Sep 21, 2021
36a13b9
Update quest_regression_test, signed distance examples
publixsubfan Sep 21, 2021
27156b6
Add option to set allocator ID in signed distance C interface
publixsubfan Sep 22, 2021
95283cb
Update shroud interface for quest with new allocator ID function
publixsubfan Sep 22, 2021
da48f7e
Testing: add custom allocator pool test for signed distance
publixsubfan Sep 22, 2021
3ac5081
Documentation: update for SignedDistance interface changes
publixsubfan Sep 22, 2021
0afa5b1
Delete BVHTree from Spin
publixsubfan Sep 22, 2021
169f6c5
Bugfix: fix dumping out BVH to vtk
publixsubfan Sep 22, 2021
122ff50
Update spin example to use BVH instead of BVHTree
publixsubfan Sep 22, 2021
e3b87fb
Remove BVHTree documentation, add preliminary BVH docs
publixsubfan Sep 22, 2021
f07767e
Docs: clarify SignedDistance ctor options, add batched example
publixsubfan Sep 22, 2021
5a50a3a
Minor: align comments
publixsubfan Sep 22, 2021
66f6b92
Minor: BVH tree -> BVH
publixsubfan Sep 22, 2021
b1e41f7
Revert "Minor: align comments"
publixsubfan Sep 23, 2021
b24b52d
Docs: include info about BVH device traversal API
publixsubfan Sep 23, 2021
4529851
Update changelog
publixsubfan Sep 23, 2021
4d8b6bd
Minor: build fixes
publixsubfan Sep 23, 2021
67f7fcf
Improve Klee build and documentaiton.
Sep 24, 2021
dd96d30
Merge branch 'develop' into klee
estebanpauli Sep 24, 2021
cf98c1d
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Sep 29, 2021
c160232
Fixed typo.
rhornung67 Sep 29, 2021
22f6f5d
Docs: clarify allocator id parameter
publixsubfan Sep 30, 2021
645d253
Docs: minor clarification
publixsubfan Sep 30, 2021
6a3b6de
Merge pull request #658 from LLNL/feature/yang39/signed-dist-cleanup
publixsubfan Sep 30, 2021
f364b73
Merge branch 'develop' into feature/yang39/remove-bvhtree
publixsubfan Oct 1, 2021
875e521
Merge pull request #659 from LLNL/feature/yang39/remove-bvhtree
publixsubfan Oct 1, 2021
0171abf
move fmt's headers under include/axom/fmt directory instead of just i…
white238 Sep 22, 2021
54d1e8d
move cli11 headers
white238 Sep 22, 2021
c0b0bee
fix examples
white238 Sep 22, 2021
3f1beb0
move sol header
white238 Sep 22, 2021
cbd657f
move sparsehash headers
white238 Sep 22, 2021
46dd9b8
fix paths inside sparsehash
white238 Sep 22, 2021
7a0db4b
change to quotes
white238 Sep 22, 2021
d669058
fmt namespace to axom::fmt
white238 Sep 22, 2021
450c01a
style
white238 Sep 22, 2021
9a2cfaf
CLI namespace axom::CLI
white238 Sep 22, 2021
4179999
sparsehash namespace to axom::google
white238 Sep 30, 2021
68b1114
sol namespace to axom::sol
white238 Sep 30, 2021
95c11b9
style
white238 Sep 30, 2021
2204a56
update release notes
white238 Oct 1, 2021
db09d8e
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Oct 1, 2021
391b90c
Merge branch 'develop' into klee
kennyweiss Oct 1, 2021
6dd7266
Update spack packages for new versions of umpire and raja.
rhornung67 Oct 1, 2021
0a6be2e
Update blt submodule to latest release
rhornung67 Oct 1, 2021
3b18fc1
Attempting to update TPL build docs.
rhornung67 Oct 1, 2021
4e64bd5
Merge pull request #656 from LLNL/feature/white238/fmt_namespace
white238 Oct 1, 2021
6746eaf
Added more description to misc tasks.
rhornung67 Oct 1, 2021
d1c8272
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Oct 4, 2021
e6e624d
Host-device primal functions (#660)
bmhan12 Oct 4, 2021
61a0056
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Oct 4, 2021
fd9d969
Merge pull request #648 from LLNL/rhornung67/doc-updates
rhornung67 Oct 4, 2021
434f74b
Update src/axom/klee/tests/CMakeLists.txt
estebanpauli Oct 5, 2021
d75866e
Add example showing data vs. metadata concepts in Sidre
rhornung67 Oct 7, 2021
7cf7ced
Oops. Forgot to add updated CMake file.
rhornung67 Oct 7, 2021
f64ff9f
Start of new doc section for example.
rhornung67 Oct 7, 2021
5684bd8
refactor: attempt to remove mcarray, libaxom.a builds
joshessman-llnl Aug 19, 2021
adc4829
fix: further cleanup, can build sidre mcarray test now
joshessman-llnl Aug 23, 2021
c6accae
tests: sidre mcarray storage and set tests now pass
joshessman-llnl Aug 23, 2021
d9450e1
fix: more small changes to sidre mcarray test
joshessman-llnl Aug 30, 2021
c92aa6f
tests: more progress on resizing check test
joshessman-llnl Aug 31, 2021
03ef39f
tests: more sidre tests pass
joshessman-llnl Sep 15, 2021
9b2dcbd
fix: sidre update pattern
joshessman-llnl Sep 16, 2021
2bb75a2
refactor: condense sidre::Array and sidre::MCArray into one class
joshessman-llnl Sep 21, 2021
99e0eaa
tests: fixes for core container tests
joshessman-llnl Sep 21, 2021
fa1be32
refactor: move old MCArray/sidre::Array into mint
joshessman-llnl Sep 22, 2021
623cc7f
cleanup: remove old MCArray code from core/MCArray.hpp
joshessman-llnl Sep 22, 2021
bff0269
fix: sidre header inclusion in mint, proper IndexType
joshessman-llnl Sep 30, 2021
561b693
cleanup: move deprecated mcarray test into mint
joshessman-llnl Oct 4, 2021
dc45a24
tests: fix sidre array resize test
joshessman-llnl Oct 6, 2021
393e2a5
cleanup: removed old MCArray alias headers
joshessman-llnl Oct 6, 2021
3be46fa
cleanup: remove no-longer-needed normalization function from sidre mc…
joshessman-llnl Oct 6, 2021
f091b29
fix: reference min default cap from deprecated mcarray
joshessman-llnl Oct 6, 2021
51551c8
fix: use deprecated mcarray in mint test
joshessman-llnl Oct 6, 2021
0110a16
cleanup: cleaner SFINAE, @kennyweiss docs suggestions
joshessman-llnl Oct 7, 2021
deaa38a
cleanup: move deprecated containers into deprecated directory, update…
joshessman-llnl Oct 7, 2021
8641e43
fix: only check for GPU-allocated arrays when CUDA is available
joshessman-llnl Oct 7, 2021
eaad5e9
fix: temporarily disable constant memory check in Array::print
joshessman-llnl Oct 7, 2021
b2f69b0
tests: add sidre array copy/move + tests
joshessman-llnl Oct 7, 2021
3242e38
refine first example and add to docs.
rhornung67 Oct 7, 2021
87c51f1
Merge branch 'develop' into klee
kennyweiss Oct 8, 2021
d1626b7
Merge branch 'klee' of github.com:LLNL/axom into klee
kennyweiss Oct 8, 2021
2fd1c8a
Merge branch 'develop' into klee
kennyweiss Oct 8, 2021
590cda5
Updates data submodule to 'main' to include klee shaping examples
kennyweiss Oct 8, 2021
2c870ff
Quest's shaping example depends on klee so add guards to build system
kennyweiss Oct 8, 2021
d9795d5
Merge branch 'develop' into feature/nselliott/shroud-blueprint
nselliott Oct 8, 2021
e864ba7
Fixup: Updates fmt usage in klee branch after recent namespace change
kennyweiss Oct 8, 2021
63165b8
Pass through build system changes for klee
kennyweiss Oct 8, 2021
cae17b4
Fixes dependency diagram for axom components
kennyweiss Oct 8, 2021
c2ea4b6
Fixup: CLI11 usage is now in `axom::` namespace; update new example
kennyweiss Oct 8, 2021
067a4ec
Added guard for an [email protected] function related to periodic meshes
kennyweiss Oct 8, 2021
79765c0
Updated example desccription and code snippet.
rhornung67 Oct 8, 2021
99f2a30
Workaround: define FMT_DEPRECATED to be same as AXOM_DEPRECATED
kennyweiss Oct 8, 2021
6e6d6bd
Bugfix: Usage of M_PI on Windows
kennyweiss Oct 8, 2021
4b9f354
Don't redefine FMT_DEPRECATED on Windows
kennyweiss Oct 8, 2021
1b115d6
Whitespace changes from running clangformat on generated code
nselliott Oct 8, 2021
d50c154
Refine and add text for second example.
rhornung67 Oct 8, 2021
87ac895
Another attempt to resolve M_PI on Windows
kennyweiss Oct 8, 2021
11ce5f3
Fill in text for example 3.
rhornung67 Oct 8, 2021
cabfd8e
Merge pull request #664 from LLNL/feature/nselliott/sidre-whitespace
nselliott Oct 8, 2021
c1504f1
Run make style
rhornung67 Oct 8, 2021
2cf2ed6
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Oct 8, 2021
5072119
Minor updates per PR review suggestions
kennyweiss Oct 8, 2021
8fd3c93
Merge branch 'develop' into feature/nselliott/shroud-blueprint
nselliott Oct 8, 2021
de832a9
Merge branch 'develop' into klee
kennyweiss Oct 8, 2021
99c8274
More minor changes per PR suggestions
kennyweiss Oct 8, 2021
644c010
Address reviewer comments.
rhornung67 Oct 8, 2021
860a1b8
Attempt to re-enable unit tests on Azure Windows CI build
kennyweiss Oct 8, 2021
5c4d950
Adds configuration for VS tests in Windows Azure CI Pipeline
kennyweiss Oct 9, 2021
c8747d4
Bugfix: Error check on Windows GetComputerName was inverted
kennyweiss Oct 9, 2021
98f8856
Add MPI ifdef guards to generated code
nselliott Oct 11, 2021
2af0036
Fix typo in sidre_shroud.yaml
nselliott Oct 11, 2021
05f4025
Merge pull request #670 from LLNL/bugfix/kweiss/reenable-windows-tests
kennyweiss Oct 11, 2021
87c6268
Merge branch 'develop' into feature/nselliott/shroud-blueprint
nselliott Oct 11, 2021
a9423aa
Add axom config header to SidreTypes.h
nselliott Oct 11, 2021
3b94e07
Merge branch 'feature/nselliott/shroud-blueprint' of github.com:LLNL/…
nselliott Oct 11, 2021
7f65dec
test: can we run the ubuntu16 images on the ubuntu18 vm?
joshessman-llnl Oct 11, 2021
4ff5f14
ci: move gcc8 image to ubuntu18
joshessman-llnl Oct 11, 2021
d90c0b5
fix: add gcc to spack config
joshessman-llnl Oct 11, 2021
ba19cd5
ci: switch to new hostconfigs
joshessman-llnl Oct 11, 2021
c0cfffb
fix: whitespace
joshessman-llnl Oct 11, 2021
16a18d6
Add more clarfication to example and code.
rhornung67 Oct 11, 2021
90b1f57
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Oct 11, 2021
8fe03b5
Run style check.
rhornung67 Oct 11, 2021
226542c
Merge branch 'develop' into feature/nselliott/shroud-blueprint
nselliott Oct 11, 2021
3f6b099
Fixup for sphinx documentation for bvh, point mesh queries
publixsubfan Oct 11, 2021
ee5c687
Merge pull request #666 from LLNL/feature/nselliott/shroud-blueprint
nselliott Oct 11, 2021
2f7146a
Merge branch 'develop' into bugfix/yang39/docfix
publixsubfan Oct 11, 2021
8804ebd
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Oct 11, 2021
03f198d
Fix section title
rhornung67 Oct 11, 2021
d9ec7ca
Merge branch 'rhornung67/doc-updates' of github.com:LLNL/axom into rh…
rhornung67 Oct 11, 2021
f1ff13e
Minor text edits.
rhornung67 Oct 11, 2021
1639fc9
Merge pull request #673 from LLNL/bugfix/yang39/docfix
publixsubfan Oct 11, 2021
f3ffda4
Merge branch 'develop' into rhornung67/doc-updates
rhornung67 Oct 12, 2021
51b1ec4
Merge pull request #665 from LLNL/rhornung67/doc-updates
rhornung67 Oct 12, 2021
6e1c5f9
Made several suggested by PR reviewers.
Oct 12, 2021
0c0e76e
Fixed formatting issues.
Oct 12, 2021
c0d63a5
Merge branch 'develop' into klee
kennyweiss Oct 13, 2021
c5a3746
refactor: consistent signature for string splitting, move inlet strin…
joshessman-llnl Oct 11, 2021
23c433e
docs: address comments from @kennyweiss
joshessman-llnl Oct 12, 2021
b8549d9
fix: return name if prefix is empty
joshessman-llnl Oct 12, 2021
3646b49
feat: add a simple ArrayView
joshessman-llnl Oct 13, 2021
3ea1a9c
Merge branch 'develop' into klee
kennyweiss Oct 13, 2021
09ca230
cleanup: remove Array external data constructors
joshessman-llnl Oct 13, 2021
b912a67
cleanup: remove remaining external storage stuff from Array
joshessman-llnl Oct 13, 2021
80d075d
examples: fix containers example to use ArrayView
joshessman-llnl Oct 13, 2021
d7e784d
Updates RELEASE-NOTES for changes in this branch
kennyweiss Oct 13, 2021
54bfbc0
Adds a link to klee's user docs to RELEASE-NOTES
kennyweiss Oct 13, 2021
9e77bee
bump spack commit
white238 Oct 14, 2021
a5ce8ae
lock down variants
white238 Oct 14, 2021
fa83fca
fix scr+friends branch names
white238 Oct 14, 2021
de006fe
use correct umpire pool
white238 Oct 14, 2021
d085f01
pull conduit's hdf5 fixes
white238 Oct 14, 2021
7833902
just use conduit for hdf5
white238 Oct 14, 2021
f31297f
add camp/raja/umpire spack packages with small fixes
white238 Oct 14, 2021
eb70b51
docs: update release notes
joshessman-llnl Oct 14, 2021
6f61aa4
cleanup: move array classes into their own files
joshessman-llnl Oct 14, 2021
ca1f6cb
Merge branch 'refactor/essman/reorg_array' into feature/essman/arrayview
joshessman-llnl Oct 14, 2021
0512704
fix: more specific feature test within fmt
joshessman-llnl Oct 13, 2021
d223791
fix: add temporary getAllocID to ArrayView
joshessman-llnl Oct 14, 2021
20b8b92
Merge branch 'develop' into klee
kennyweiss Oct 14, 2021
6788f87
cleanup: move array classes into their own files
joshessman-llnl Oct 14, 2021
a253a9c
Merge branch 'develop' into feature/essman/arrayview
joshessman-llnl Oct 14, 2021
203400a
Merge branch 'develop' into klee
kennyweiss Oct 14, 2021
23febe5
Merge pull request #649 from LLNL/klee
kennyweiss Oct 14, 2021
6371cb6
Merge branch 'develop' into feature/essman/arrayview
joshessman-llnl Oct 14, 2021
74746e7
update to the new raja interface
white238 Oct 14, 2021
0e3742f
temporarily turn off scr
white238 Oct 14, 2021
6dc4dff
move openmp logic to its own section and filter more openmp flags out…
white238 Oct 14, 2021
e9dc44b
Merge branch 'develop' into task/raja-tpl-updates
white238 Oct 15, 2021
c609a0f
Remove older umpire logic (#676)
bmhan12 Oct 15, 2021
9e05a27
Umpire DynamicPool to QuickPool
white238 Oct 15, 2021
66bdc11
Merge branch 'develop' into v0.6.0-RC
rhornung67 Oct 18, 2021
1e0d3cc
workaround RAJA::cub not being inherited properly
white238 Oct 19, 2021
6fd76ff
Bugfix: Resolves in/out ambiguity for grazing triangles in InOutOctree
kennyweiss Oct 20, 2021
6c3d2f3
Updates RELEASE-NOTES
kennyweiss Oct 20, 2021
e68fda6
lower hypre version to work with mfem 4.2 in rzansel klee build
white238 Oct 20, 2021
1b3679b
add rz host-configs
white238 Oct 20, 2021
f09c8f8
move locked down specs to docker
white238 Oct 20, 2021
94655b2
cleanup: update array documentation, remove duplicated nonmember ops
joshessman-llnl Oct 20, 2021
4c86e04
Adds comments about some debug variables used by quest's InOutOctree
kennyweiss Oct 20, 2021
d75eedc
examples: further demonstrate iteration in core_containers_ex
joshessman-llnl Oct 20, 2021
ef5a4c4
Merge branch 'develop' into feature/essman/arrayview
joshessman-llnl Oct 20, 2021
1e510c4
Merge pull request #687 from LLNL/bugfix/kweiss/inout-segfault
kennyweiss Oct 21, 2021
27aa66e
add cz host-configs
white238 Oct 21, 2021
a034672
add docker host-configs
white238 Oct 21, 2021
429d960
bump docker
white238 Oct 21, 2021
53a6f3e
style
white238 Oct 21, 2021
a39a94c
do shared mfem in docker builds
white238 Oct 21, 2021
9a468e8
new docker images
white238 Oct 21, 2021
ffdf9e6
Merge branch 'develop' into task/raja-tpl-updates
white238 Oct 21, 2021
def4a40
lock down conduit version to a specific git commit after the fact
white238 Oct 22, 2021
29aedac
Adds note about changes to quest's signed_distance API to RELEASE-NOTES
kennyweiss Oct 22, 2021
11657e6
More cleanup to RELEASE-NOTES
kennyweiss Oct 22, 2021
6475d73
Merge pull request #690 from LLNL/feature/kweiss/update-release-notes
kennyweiss Oct 22, 2021
6cf0197
Add method View::clear
ltaylor16 Oct 24, 2021
41357ff
Merge branch 'develop' into feature/essman/arrayview
joshessman-llnl Oct 25, 2021
9e47e2d
cleanup: remove dead code
joshessman-llnl Oct 25, 2021
b38b4f1
Merge branch 'feature/essman/arrayview' of github.com:LLNL/axom into …
joshessman-llnl Oct 25, 2021
40f9f1e
Merge branch 'develop' into task/raja-tpl-updates
white238 Oct 25, 2021
a4fb942
Add conduit's spack package so we can move to a specific git commit
white238 Oct 25, 2021
ca86e11
update release notes
white238 Oct 25, 2021
fd68279
update release notes
white238 Oct 25, 2021
c8c2946
Merge pull request #683 from LLNL/task/raja-tpl-updates
white238 Oct 25, 2021
674b51e
Merge branch 'develop' into feature/essman/arrayview
joshessman-llnl Oct 25, 2021
7f64bad
Merge branch 'develop' into v0.6.0-RC
rhornung67 Oct 25, 2021
ea9738f
Add View::clear() to RELEASE_NOTES.md
ltaylor16 Oct 25, 2021
b833884
Merge branch 'develop' into feature/taylor/clear_view
ltaylor16 Oct 25, 2021
36c3aeb
Merge pull request #691 from LLNL/feature/taylor/clear_view
ltaylor16 Oct 26, 2021
eac7d46
Make all single-argument constructors in Primal explicit (#686)
agcapps Oct 26, 2021
76fd218
Merge branch 'develop' into feature/essman/arrayview
joshessman-llnl Oct 26, 2021
f9e8219
ci: no-op commit to retrigger CI
joshessman-llnl Oct 27, 2021
5f72c78
Merge pull request #678 from LLNL/feature/essman/arrayview
joshessman-llnl Oct 27, 2021
ca1a0b1
fix: pin docutils version
joshessman-llnl Oct 27, 2021
48e3ee0
Merge pull request #696 from LLNL/hotfix/essman/rtd_failure
white238 Oct 27, 2021
8ddc3e5
Bugfix for GitLab CI allocations (#689)
kennyweiss Nov 2, 2021
ed0efb5
Merge branch 'develop' into v0.6.0-RC
rhornung67 Nov 2, 2021
b1d6b3f
Update version number for release.
rhornung67 Nov 2, 2021
ba1167b
Added header for release section, spelling mods for consistency
rhornung67 Nov 2, 2021
a46e3ca
Update release number.
rhornung67 Nov 2, 2021
20841a5
removed extraneous space.
rhornung67 Nov 2, 2021
7414978
Minor updates to RELEASE-NOTES
kennyweiss Nov 2, 2021
95abff7
Updates mailmap
kennyweiss Nov 2, 2021
718bc45
Adds a CITATION file to Axom
kennyweiss Nov 3, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ tpl_dirs_summary.json
*.vscode*
uberenv_libs
*_build*
.idea
13 changes: 6 additions & 7 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ variables:
PROJECT_ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
BUILD_ROOT: ${CI_PROJECT_DIR}
FULL_BUILD_ROOT: ${CI_BUILDS_DIR}/axom/${CI_JOB_NAME}
SLURM_OVERLAP: 1

stages:
- allocate
Expand All @@ -30,10 +31,9 @@ stages:
- JOBID=$(if [[ "$SYS_TYPE" == "toss_3_x86_64_ib" ]]; then squeue -h --name=${PROJECT_ALLOC_NAME} --format=%A; fi)
- ASSIGN_ID=$(if [[ -n "${JOBID}" ]]; then echo "--jobid=${JOBID}"; fi)
# BUILD + TEST
- echo -e "section_start:$(date +%s):src_build_and_test\r\e[0K
Source Build and Test ${CI_PROJECT_NAME}"
- ${ALLOC_COMMAND} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options -DENABLE_DOCS=OFF
- echo -e "section_end:$(date +%s):src_build_and_test\r\e[0K"
- echo -e "\e[0Ksection_start:$(date +%s):src_build_and_test\r\e[0KSource Build and Test ${CI_PROJECT_NAME}"
- ${ALLOC_COMMAND} ${ASSIGN_ID} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options -DENABLE_DOCS=OFF
- echo -e "\e[0Ksection_end:$(date +%s):src_build_and_test\r\e[0K"
artifacts:
paths:
- _axom_build_and_test_*/output.log*.txt
Expand All @@ -43,10 +43,9 @@ stages:

.full_build_script:
script:
- echo -e "section_start:$(date +%s):full_build_and_test\r\e[0K
Full Build and Test ${CI_PROJECT_NAME}"
- echo -e "\e[0Ksection_start:$(date +%s):full_build_and_test\r\e[0KFull Build and Test ${CI_PROJECT_NAME}"
- ${ALLOC_COMMAND} python3 scripts/llnl_scripts/build_tpls.py -v --spec="${SPEC} ${EXTRA_SPEC}" --directory=${FULL_BUILD_ROOT}
- echo -e "section_end:$(date +%s):full_build_and_test\r\e[0K"
- echo -e "\e[0Ksection_end:$(date +%s):full_build_and_test\r\e[0K"
artifacts:
paths:
- ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/output.log*.txt
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/build_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ ruby_release:
.src_build_on_ruby:
stage: build
variables:
ALLOC_COMMAND: "srun -p pdebug -t 30 -N 1 ${ASSIGN_ID}"
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1 "
extends: [.src_build_script, .on_ruby, .src_workflow]
needs: [ruby_allocate]

.full_build_on_ruby:
stage: build
variables:
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1"
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1 "
extends: [.full_build_script, .on_ruby, .full_workflow]
needs: []

Expand Down
103 changes: 103 additions & 0 deletions .gitlab/build_rzansel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
# other Axom Project Developers. See the top-level LICENSE file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)

####
# This is the share configuration of jobs for rzansel
.on_rzansel:
variables:
tags:
- shell
- rzansel
before_script:
- module load cmake/3.14.5

####
# Load required CUDA module
.with_cuda:
before_script:
- module load cuda/10.1.243

####
# Template
.src_build_on_rzansel:
stage: build
variables:
ALLOC_COMMAND: "lalloc 1 -W 25 -q pdebug"
extends: [.src_build_script, .on_rzansel, .src_workflow]
needs: []

.full_build_on_rzansel:
stage: build
variables:
ALLOC_COMMAND: "lalloc 1 -W 45 -q pdebug"
extends: [.full_build_script, .on_rzansel, .full_workflow]
needs: []

####
# PR Build jobs
rzansel-clang_8_0_1_nvcc_xlf-src:
variables:
COMPILER: "[email protected]_nvcc_xlf"
HOST_CONFIG: "rzansel-klee-${COMPILER}.cmake"
extends: [.src_build_on_rzansel, .with_cuda]

rzansel-clang_9_0_0_upstream_xlf-src:
variables:
COMPILER: "[email protected]_upstream_xlf"
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
extends: [.src_build_on_rzansel]

rzansel-gcc_7_3_1-src:
variables:
COMPILER: "[email protected]"
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
extends: [.src_build_on_rzansel]

rzansel-xl_16_1_1-src:
variables:
COMPILER: "[email protected]_coral"
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
extends: [.src_build_on_rzansel]

rzansel-xl_16_1_1_nvcc-src:
variables:
COMPILER: "[email protected]_nvcc"
HOST_CONFIG: "rzansel-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
extends: [.src_build_on_rzansel, .with_cuda]


####
# Full Build jobs
rzansel-clang_8_0_1_nvcc_xlf-full:
variables:
COMPILER: "[email protected]_nvcc_xlf"
SPEC: "%${COMPILER}+mfem+cuda~openmp"
EXTRA_SPEC: "cuda_arch=70"
extends: [.full_build_on_rzansel, .with_cuda]

rzansel-clang_9_0_0_upstream_xlf-full:
variables:
COMPILER: "[email protected]_upstream_xlf"
SPEC: "%${COMPILER}+mfem~openmp"
extends: [.full_build_on_rzansel]

rzansel-gcc_7_3_1-full:
variables:
COMPILER: "[email protected]"
SPEC: "%${COMPILER}+mfem"
extends: [.full_build_on_rzansel]

rzansel-xl_16_1_1_coral-full:
variables:
COMPILER: "[email protected]_coral"
SPEC: "%${COMPILER}+mfem~openmp~cpp14"
extends: [.full_build_on_rzansel]

rzansel-xl_16_1_1_nvcc-full:
variables:
COMPILER: "[email protected]_nvcc"
SPEC: "%${COMPILER}+mfem+cuda~openmp~cpp14"
EXTRA_SPEC: "cuda_arch=70"
extends: [.full_build_on_rzansel, .with_cuda]
96 changes: 96 additions & 0 deletions .gitlab/build_rzgenie.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
# Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC and
# other Axom Project Developers. See the top-level LICENSE file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)

####
# This is the shared configuration of jobs for rzgenie
.on_rzgenie:
tags:
- shell
- rzgenie
before_script:
- module load cmake/3.14.5


####
# Template
.src_build_on_rzgenie:
stage: build
variables:
ALLOC_COMMAND: "salloc -p pdebug -t 30 -N 1 -n36 srun --interactive -n1"
extends: [.src_build_script, .on_rzgenie, .src_workflow]
needs: []

.full_build_on_rzgenie:
stage: build
variables:
ALLOC_COMMAND: "srun -p pdebug -t 60 -N 1 -n 1"
extends: [.full_build_script, .on_rzgenie, .full_workflow]
needs: []

####
# PR Build jobs
rzgenie-clang_10_0_0-src:
variables:
COMPILER: "[email protected]"
HOST_CONFIG: "[email protected]"
extends: .src_build_on_rzgenie

rzgenie-gcc_8_1_0-src:
variables:
COMPILER: "[email protected]"
HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
extends: .src_build_on_rzgenie

# disabled due to time limit
# rzgenie-intel_18_0_2-src:
# variables:
# COMPILER: "[email protected]"
# HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
# extends: .src_build_on_rzgenie

rzgenie-intel_19_0_4-src:
variables:
COMPILER: "[email protected]"
HOST_CONFIG: "rzgenie-toss_3_x86_64_ib-${COMPILER}.cmake"
extends: .src_build_on_rzgenie


####
# Full Build jobs
rzgenie-clang_10_0_0-full:
variables:
COMPILER: "[email protected]"
SPEC: "%${COMPILER}+mfem"
extends: .full_build_on_rzgenie

rzgenie-clang_9_0_0-full:
variables:
COMPILER: "[email protected]"
SPEC: "%${COMPILER}+mfem"
extends: .full_build_on_rzgenie

rzgenie-gcc_8_1_0-full:
variables:
COMPILER: "[email protected]"
SPEC: "%${COMPILER}+mfem"
extends: .full_build_on_rzgenie

rzgenie-gcc_8_1_no_fortran-full:
variables:
COMPILER: "[email protected]_no_fortran"
SPEC: "%${COMPILER}~fortran+mfem"
extends: .full_build_on_rzgenie

rzgenie-intel_18_0_2-full:
variables:
COMPILER: "[email protected]"
SPEC: "%${COMPILER}+mfem~cpp14"
extends: .full_build_on_rzgenie

rzgenie-intel_19_0_4-full:
variables:
COMPILER: "[email protected]"
SPEC: "%${COMPILER}+mfem~cpp14"
extends: .full_build_on_rzgenie
4 changes: 4 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Aaron Black <[email protected]> Aaron C. Black <[email protected]>
Adam J. Kunen <[email protected]> Adam J. Kunen <[email protected]>
Adrien M. Bernede <[email protected]> Adrien Bernede <[email protected]>
Aesha Parekh <[email protected]> Aesha Parekh <[email protected]>
Arlie Capps <[email protected]> Arlie Capps <[email protected]>
Arlie Capps <[email protected]> Arlie Capps <[email protected]>
Expand All @@ -24,6 +25,7 @@ George Zagaris <[email protected]> George Zagaris <george.zagaris@g
Joe Hennis <[email protected]> Hennis <[email protected]>
Joe Hennis <[email protected]> hennis1 <[email protected]>
Josh Essman <[email protected]> Josh Essman <[email protected]>
Kae Suarez <[email protected]> Kae S <[email protected]>
Kenneth Weiss <[email protected]> Kenneth Weiss <[email protected]>
Kenneth Weiss <[email protected]> Kenny Weiss <[email protected]>
Kenneth Weiss <[email protected]> Kenny Weiss <[email protected]>
Expand All @@ -45,6 +47,8 @@ Randolph Settgast <[email protected]> Randolph R. Settgast <rrsettgast
Randolph Settgast <[email protected]> Randolph R. Settgast <[email protected]>
Randolph Settgast <[email protected]> Randy Settgast <[email protected]>
Richard D. Hornung <[email protected]> Rich Hornung <[email protected]>
Robert Carson <[email protected]> Robert <[email protected]>
Robert Carson <[email protected]> rcarson3 <[email protected]>

Axom Shared User <[email protected]> Asctoolkit Shared User <[email protected]>
Axom Shared User <[email protected]> Asctoolkit Shared User <[email protected]>
Expand Down
2 changes: 2 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ formats: all
# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- requirements: src/docs/requirements.txt
4 changes: 2 additions & 2 deletions .uberenv_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"package_final_phase": "initconfig",
"package_source_dir": "../..",
"spack_url": "https://github.com/spack/spack",
"spack_commit": "764c17053041a65f684ce565a2598d705b04a16b",
"spack_commit": "d19105f76165857ca5f25ddb7e63a45a31b2ee92",
"spack_configs_path": "scripts/spack/configs",
"spack_packages_path": "scripts/spack/packages",
"vcpkg_url": "https://github.com/microsoft/vcpkg",
"vcpkg_commit": "b79f7675aaa82eb6c5a96ae764fb1ce379a9d5d6",
"vcpkg_commit": "5568f110b509a9fd90711978a7cb76bae75bb092",
"vcpkg_triplet": "x64-windows",
"vcpkg_ports_path": "scripts/vcpkg_ports"
}
43 changes: 43 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
cff-version: 1.2.0
message: "If you use Axom, please cite it as follows."
title: "Axom: CS infrastructure components for HPC applications"
doi: 10.11578/dc.20210915.2
url: https://github.com/llnl/axom
license: BSD-3-Clause
authors:
- family-names: Capps
given-names: Arlie
- family-names: Carson
given-names: Robert
- family-names: Corbett
given-names: Benjamin
- family-names: Elliott
given-names: Noah
- family-names: Essman
given-names: Josh
- family-names: Han
given-names: Brian
- family-names: Harrison
given-names: Cyrus
- family-names: Hornung
given-names: Richard
- family-names: Larsen
given-names: Matthew
- family-names: Moody
given-names: Adam
- family-names: Pauli
given-names: Esteban
- family-names: Settgast
given-names: Randolph
- family-names: Taylor
given-names: Lee
- family-names: Weiss
given-names: Kenneth
orcid: "https://orcid.org/0000-0001-6649-8022"
- family-names: White
given-names: Christopher
- family-names: Yang
given-names: Max
- family-names: Zagaris
given-names: George

12 changes: 10 additions & 2 deletions RELEASE
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
*******************************************************************************

Axom: ................................, version 0.5.0
Axom: ................................, version 0.6.0

Copyright (c) 2017-2021, Lawrence Livermore National Security, LLC.
Produced at the Lawrence Livermore National Laboratory.
All rights reserved. See details in the file axom/LICENSE.

Current open source release information:
Unclassified/Open Source - BSD Distribution
LLNL-CODE-825966
CP02462

Previous open source releases:
Unlimited Open Source - BSD Distribution
LLNL-CODE-741217
OCEC-17-187

The Axom development team is comprised of:

Rich Hornung ([email protected])
Arlie Capps ([email protected])
Noah Elliott ([email protected])
Josh Essman ([email protected])
Brian Han ([email protected])
Cyrus Harrison ([email protected])
Rich Hornung ([email protected])
Esteban Pauli ([email protected])
Lee Taylor ([email protected])
Kenny Weiss ([email protected])
Chris White ([email protected])
Expand Down
Loading