ci - fix OCCA install

CEED · Oct 11, 2022 · f5aae5b · f5aae5b
1 parent bd2fc77
commit f5aae5b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 745 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,8 +22,8 @@ noether-cpu:
     - cd .. && export XSMM_HASH=44433be9426eddaed88415646c15b3bcc61afc85 && { [[ -d libxsmm-$XSMM_HASH ]] || { curl -L https://github.com/libxsmm/libxsmm/archive/$XSMM_HASH.tar.gz -o xsmm.tar.gz && tar zvxf xsmm.tar.gz && rm xsmm.tar.gz && make -C libxsmm-$XSMM_HASH -j$(nproc); }; } && export XSMM_DIR=$PWD/libxsmm-$XSMM_HASH && cd libCEED
     - echo "-------------- LIBXSMM -------------" && basename $XSMM_DIR
 # -- OCCA v1.1.0
-    - cd .. && export OCCA_VERSION=occa-1.4.0 OCCA_OPENCL_ENABLED=0 && { [[ -d $OCCA_VERSION ]] || { git clone --depth 1 --branch v1.4.0 https://github.com/libocca/occa.git $OCCA_VERSION && make -C $OCCA_VERSION -j$(nproc); }; } && export OCCA_DIR=$PWD/$OCCA_VERSION && cd libCEED
-    - echo "-------------- OCCA ----------------" && make -C $OCCA_DIR info
+    - cd .. && export OCCA_VERSION=occa-1.4.0 && { [[ -d $OCCA_VERSION ]] || { git clone --depth 1 --branch v1.4.0 https://github.com/libocca/occa.git $OCCA_VERSION && cd $OCCA_VERSION && export ENABLE_OPENCL="OFF" ENABLE_DPCPP="OFF" ENABLE_HIP="OFF" ENABLE_CUDA="OFF" && ./configure-cmake.sh && cmake --build build --parallel $NPROC_CPU && cmake --install build --prefix . && cd ..; }; } && export OCCA_DIR=$PWD/$OCCA_VERSION && cd libCEED
+    - echo "-------------- OCCA ----------------" && git -C $OCCA_DIR describe --tags
   script:
     - rm -f .SUCCESS
 # libCEED

diff --git a/backends/occa/include/ceed.h b/backends/occa/include/ceed.h
diff --git a/backends/occa/include/ceed/ceed-f32.h b/backends/occa/include/ceed/ceed-f32.h
diff --git a/backends/occa/include/ceed/ceed-f64.h b/backends/occa/include/ceed/ceed-f64.h