update how elements builds

lanl · Dec 11, 2024 · e78d8b0 · e78d8b0
1 parent 363ae5f
commit e78d8b0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.conda/elements/LICENSE → .conda/elements/cpu/LICENSE b/.conda/elements/LICENSE → .conda/elements/cpu/LICENSE
diff --git a/.conda/elements/build.sh → .conda/elements/cpu/build.sh b/.conda/elements/build.sh → .conda/elements/cpu/build.sh
@@ -15,6 +15,7 @@ cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
       -D CMAKE_CXX_STANDARD:STRING=17 \
       -D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \
+      -D Matar_ENABLE_KOKKOS=ON \
       $CMAKE_ARGS \
       $SRC_DIR \
       -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \

diff --git a/.conda/elements/meta.yaml → .conda/elements/cpu/meta.yaml b/.conda/elements/meta.yaml → .conda/elements/cpu/meta.yaml
@@ -18,9 +18,18 @@ build:
 
 requirements:
   build:
-    - cmake >=3.10.0
+    - cmake >=3.17.0
     - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
+    - matar-cpu
+  host:
+    - openmpi
+    - matar-cpu
+    - kokkos=4.1
+  run:
+    - openmpi
+    - matar-cpu
+    - kokkos=4.1
 
 about:
   home: https://github.com/lanl/ELEMENTS

diff --git a/.github/workflows/publish-all.yml b/.github/workflows/publish-all.yml
@@ -3,8 +3,8 @@ name: Publish All
 on: workflow_dispatch
 
 jobs:
-  elements:
-    uses: ./.github/workflows/publish-elements.yml
+  elements-cpu:
+    uses: ./.github/workflows/publish-elements-cpu.yml
 
   evpfft-cpu:
     uses: ./.github/workflows/publish-evpfft-cpu.yml

diff --git a/.github/workflows/publish-elements.yaml → .github/workflows/publish-elements-cpu.yaml b/.github/workflows/publish-elements.yaml → .github/workflows/publish-elements-cpu.yaml
@@ -1,15 +1,15 @@
-name: 'Publish Elements'
+name: 'Publish Elements-CPU'
 
 on: 
   push:
     paths:
       - .conda/elements/**
-      - .github/workflows/publish-elements.yaml
+      - .github/workflows/publish-elements-cpu.yaml
   workflow_dispatch:
 
 jobs:
   publish:
     uses: ./.github/workflows/build-conda-package.yaml
     with:
-      recipe_dir: .conda/elements
-    secrets: inherit
+      recipe_dir: .conda/elements/cpu
+    secrets: inherit