[WIP] OCCA Backend Update

Makefile

@@ -382,7 +382,7 @@ endif
 # OCCA Backends
 OCCA_BACKENDS = /cpu/self/occa
 ifneq ($(wildcard $(OCCA_DIR)/lib/libocca.*),)
-  OCCA_MODES := $(shell LD_LIBRARY_PATH=$(OCCA_DIR)/lib $(OCCA_DIR)/bin/occa modes)
+  OCCA_MODES := $(shell LD_LIBRARY_PATH+=:$(OCCA_DIR)/lib $(OCCA_DIR)/bin/occa modes)
   OCCA_BACKENDS += $(if $(filter OpenMP,$(OCCA_MODES)),/cpu/openmp/occa)
   OCCA_BACKENDS += $(if $(filter dpcpp,$(OCCA_MODES)),/gpu/dpcpp/occa)
   OCCA_BACKENDS += $(if $(filter OpenCL,$(OCCA_MODES)),/gpu/opencl/occa)

README.md

@@ -167,7 +167,7 @@ There are multiple supported backends, which can be selected at runtime in the e
 | `/*/occa`                  | Selects backend based on available OCCA modes     | Yes                   |
 | `/cpu/self/occa`           | OCCA backend with serial CPU kernels              | Yes                   |
 | `/cpu/openmp/occa`         | OCCA backend with OpenMP kernels                  | Yes                   |
-| `/cpu/dpcpp/occa`          | OCCA backend with CPC++ kernels                   | Yes                   |
+| `/cpu/dpcpp/occa`          | OCCA backend with SYCL/DPC++ kernels                   | Yes                   |
 | `/gpu/cuda/occa`           | OCCA backend with CUDA kernels                    | Yes                   |
 | `/gpu/hip/occa`~           | OCCA backend with HIP kernels                     | Yes                   |
 

backends/occa/ceed-occa-operator.cpp

@@ -100,6 +100,7 @@ int Operator::ceedCreate(CeedOperator op) {
   CeedOccaRegisterFunction(op, "LinearAssembleQFunctionUpdate", Operator::ceedLinearAssembleQFunction);
   CeedOccaRegisterFunction(op, "LinearAssembleAddDiagonal", Operator::ceedLinearAssembleAddDiagonal);
   CeedOccaRegisterFunction(op, "LinearAssembleAddPointBlockDiagonal", Operator::ceedLinearAssembleAddPointBlockDiagonal);
+  CeedOccaRegisterFunction(op, "LinearAssembleSingle", Operator::ceedLinearAssembleSingle);
   CeedOccaRegisterFunction(op, "CreateFDMElementInverse", Operator::ceedCreateFDMElementInverse);
   CeedOccaRegisterFunction(op, "ApplyAdd", Operator::ceedApplyAdd);
   CeedOccaRegisterFunction(op, "Destroy", Operator::ceedDestroy);
@@ -117,18 +118,26 @@ int Operator::ceedCreateComposite(CeedOperator op) {
   return CEED_ERROR_SUCCESS;
 }
 
-int Operator::ceedLinearAssembleQFunction(CeedOperator op) { return staticCeedError("(OCCA) Backend does not implement LinearAssembleQFunction"); }
+int Operator::ceedLinearAssembleQFunction(CeedOperator op) { 
+  return staticCeedError("(OCCA) Backend does not implement LinearAssembleQFunction"); 
+}
 
 int Operator::ceedLinearAssembleQFunctionUpdate(CeedOperator op) {
   return staticCeedError("(OCCA) Backend does not implement LinearAssembleQFunctionUpdate");
 }
 
-int Operator::ceedLinearAssembleAddDiagonal(CeedOperator op) { return staticCeedError("(OCCA) Backend does not implement LinearAssembleDiagonal"); }
+int Operator::ceedLinearAssembleAddDiagonal(CeedOperator op) { 
+  return staticCeedError("(OCCA) Backend does not implement LinearAssembleDiagonal"); 
+}
 
 int Operator::ceedLinearAssembleAddPointBlockDiagonal(CeedOperator op) {
   return staticCeedError("(OCCA) Backend does not implement LinearAssemblePointBlockDiagonal");
 }
 
+int Operator::ceedLinearAssembleSingle(CeedOperator op) {
+  return staticCeedError("(OCCA) Backend does not implement LinearAssembleSingle");
+}
+
 int Operator::ceedCreateFDMElementInverse(CeedOperator op) { return staticCeedError("(OCCA) Backend does not implement CreateFDMElementInverse"); }
 
 int Operator::ceedApplyAdd(CeedOperator op, CeedVector invec, CeedVector outvec, CeedRequest *request) {

backends/occa/ceed-occa-operator.hpp

@@ -62,6 +62,7 @@ class Operator : public CeedObject {
   static int ceedLinearAssembleQFunctionUpdate(CeedOperator op);
   static int ceedLinearAssembleAddDiagonal(CeedOperator op);
   static int ceedLinearAssembleAddPointBlockDiagonal(CeedOperator op);
+  static int ceedLinearAssembleSingle(CeedOperator op);
   static int ceedCreateFDMElementInverse(CeedOperator op);
 
   static int ceedApplyAdd(CeedOperator op, CeedVector invec, CeedVector outvec, CeedRequest *request);

backends/occa/ceed-occa.cpp

@@ -323,7 +323,7 @@ CEED_INTERN int CeedRegister_Occa(void) {
   CeedCallBackend(CeedRegister("/cpu/openmp/occa", ceed::occa::registerBackend, 250));
   // GPU Modes
   CeedCallBackend(CeedRegister("/gpu/dpcpp/occa", ceed::occa::registerBackend, 240));
-  CeedCallBackend(CeedRegister("/gpu/opencl/occa", ceed::occa::registerBackend, 230));
+  // CeedCallBackend(CeedRegister("/gpu/opencl/occa", ceed::occa::registerBackend, 230));
   CeedCallBackend(CeedRegister("/gpu/hip/occa", ceed::occa::registerBackend, 220));
   CeedCallBackend(CeedRegister("/gpu/cuda/occa", ceed::occa::registerBackend, 210));
   return CEED_ERROR_SUCCESS;

backends/occa/include/ceed.h

@@ -0,0 +1,4 @@
+#ifndef _OCCA_INCLUDE_CEED_H_
+#define _OCCA_INCLUDE_CEED_H_
+// Phony header to include when compiling OKL
+#endif

backends/occa/include/ceed/ceed-f32.h

@@ -0,0 +1,23 @@
+/// Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and other CEED contributors.
+/// All Rights Reserved. See the top-level LICENSE and NOTICE files for details.
+///
+/// SPDX-License-Identifier: BSD-2-Clause
+///
+/// This file is part of CEED:  http://github.com/ceed
+
+/// @file
+/// Public header for definitions related to using FP32 floating point (single
+/// precision) for CeedScalar.  Include this header in ceed/ceed.h to use 
+/// float instead of double. 
+#ifndef _ceed_f32_h
+#define _ceed_f32_h
+
+/// Set base scalar type to FP32.  (See CeedScalarType enum in ceed/ceed.h
+/// for all options.)
+#define CEED_SCALAR_TYPE CEED_SCALAR_FP32
+typedef float CeedScalar;
+
+/// Machine epsilon
+#define CEED_EPSILON 6e-08
+
+#endif

backends/occa/include/ceed/ceed-f64.h

@@ -0,0 +1,22 @@
+/// Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and other CEED contributors.
+/// All Rights Reserved. See the top-level LICENSE and NOTICE files for details.
+///
+/// SPDX-License-Identifier: BSD-2-Clause
+///
+/// This file is part of CEED:  http://github.com/ceed
+
+/// @file
+/// Public header for definitions related to using FP64 floating point (double
+/// precision) for CeedScalar. This is the default header included in ceed/ceed.h. 
+#ifndef _ceed_f64_h
+#define _ceed_f64_h
+
+/// Set base scalar type to FP64.  (See CeedScalarType enum in ceed/ceed.h
+/// for all options.)
+#define CEED_SCALAR_TYPE CEED_SCALAR_FP64
+typedef double CeedScalar;
+
+/// Machine epsilon
+#define CEED_EPSILON 1e-16
+
+#endif