diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7dcb9f5e4b..67937133f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,8 @@ noether-rocm: - echo "-------------- OCCA ----------------" && make -C $OCCA_DIR info # libCEED - make configure HIP_DIR=/opt/rocm OPT='-O -march=native -ffp-contract=fast' - - BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*') +# Note: OCCA backends currently disabled in CI + - BACKENDS_CPU=$(OCCA_DIR= make info-backends-all | grep -o '/cpu[^ ]*') && BACKENDS_GPU=$(OCCA_DIR= make info-backends | grep -o '/gpu[^ ]*') - echo "-------------- libCEED -------------" && make info - echo "-------------- BACKENDS_CPU---------" && echo $BACKENDS_CPU - echo "-------------- BACKENDS_GPU---------" && echo $BACKENDS_GPU diff --git a/Makefile b/Makefile index aa8bbca455..23e1a1d107 100644 --- a/Makefile +++ b/Makefile @@ -637,9 +637,6 @@ install : $(libceed) $(OBJDIR)/ceed.pc $(INSTALL_DATA) $(OBJDIR)/ceed.pc "$(DESTDIR)$(pkgconfigdir)/" $(INSTALL_DATA) include/ceed.h "$(DESTDIR)$(includedir)/" $(INSTALL_DATA) include/ceedf.h "$(DESTDIR)$(includedir)/" - $(INSTALL_DATA) include/ceed-backend.h "$(DESTDIR)$(includedir)/" - $(INSTALL_DATA) include/ceed-hash.h "$(DESTDIR)$(includedir)/" - $(INSTALL_DATA) include/ceed-khash.h "$(DESTDIR)$(includedir)/" .PHONY : all cln clean doxygen doc lib install par print test tst prove prv prove-all junit examples style style-c style-py tidy info info-backends info-backends-all diff --git a/backends/occa/ceed-occa.cpp b/backends/occa/ceed-occa.cpp index 6a707104bc..d7cb072892 100644 --- a/backends/occa/ceed-occa.cpp +++ b/backends/occa/ceed-occa.cpp @@ -14,6 +14,8 @@ // software, applications, hardware, advanced system engineering and early // testbed platforms, in support of the nation's exascale computing imperative. + #warning "libCEED OCCA backend is experimental; for best performance, use device native backends" + #include #include #include diff --git a/doc/sphinx/source/releasenotes.md b/doc/sphinx/source/releasenotes.md index 4cc6d51822..053d2370d8 100644 --- a/doc/sphinx/source/releasenotes.md +++ b/doc/sphinx/source/releasenotes.md @@ -14,6 +14,8 @@ for each release of libCEED. - Clarify and document conditions where `CeedQFunction` and `CeedOperator` become immutable and no further fields or suboperators can be added. - Add {c:func} `CeedOperatorLinearAssembleQFunctionBuildOrUpdate` to reduce object creation overhead in assembly of CeedOperator preconditioning ingredients. - Promote {c:func} `CeedOperatorCheckReady`to the public API to facilitate interactive interfaces. +- Warning added when compiling OCCA backend to alert users that this backend is experimental. +- `ceed-backend.h`, `ceed-hash.h`, and `ceed-khash.h` removed. Users should use `ceed/backend.h`, `ceed/hash.h`, and `ceed/khash.h`. ### New features diff --git a/include/ceed-backend.h b/include/ceed-backend.h deleted file mode 100644 index c0d870f843..0000000000 --- a/include/ceed-backend.h +++ /dev/null @@ -1,3 +0,0 @@ -#include - -#warning is deprecated and will be removed in libCEED v0.9; use diff --git a/include/ceed-hash.h b/include/ceed-hash.h deleted file mode 100644 index 803a25c6ec..0000000000 --- a/include/ceed-hash.h +++ /dev/null @@ -1,3 +0,0 @@ -#include - -#warning is deprecated and will be removed in libCEED v0.9; use diff --git a/include/ceed-khash.h b/include/ceed-khash.h deleted file mode 100644 index 06987302d1..0000000000 --- a/include/ceed-khash.h +++ /dev/null @@ -1,3 +0,0 @@ -#include - -#warning is deprecated and will be removed in libCEED v0.9; use