cuda/hip - include *-jit.h via #include

CEED · Oct 17, 2024 · 16c496e · 16c496e
1 parent ba17a79
commit 16c496e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/backends/cuda/ceed-cuda-compile.cpp b/backends/cuda/ceed-cuda-compile.cpp
@@ -37,7 +37,6 @@
 int CeedCompile_Cuda(Ceed ceed, const char *source, CUmodule *module, const CeedInt num_defines, ...) {
   size_t                ptx_size;
   char                 *ptx;
-  const char           *jit_defs_path, *jit_defs_source;
   const int             num_opts            = 4;
   CeedInt               num_jit_source_dirs = 0;
   const char          **opts;
@@ -65,17 +64,7 @@ int CeedCompile_Cuda(Ceed ceed, const char *source, CUmodule *module, const Ceed
   }
 
   // Standard libCEED definitions for CUDA backends
-  CeedCallBackend(CeedGetJitAbsolutePath(ceed, "ceed/jit-source/cuda/cuda-jit.h", &jit_defs_path));
-  {
-    char *source;
-
-    CeedCallBackend(CeedLoadSourceToBuffer(ceed, jit_defs_path, &source));
-    jit_defs_source = source;
-  }
-  code << jit_defs_source;
-  code << "\n\n";
-  CeedCallBackend(CeedFree(&jit_defs_path));
-  CeedCallBackend(CeedFree(&jit_defs_source));
+  code << "#include <ceed/jit-source/cuda/cuda-jit.h>\n\n";
 
   // Non-macro options
   CeedCallBackend(CeedCalloc(num_opts, &opts));

diff --git a/backends/hip/ceed-hip-compile.cpp b/backends/hip/ceed-hip-compile.cpp
@@ -35,8 +35,7 @@
 //------------------------------------------------------------------------------
 int CeedCompile_Hip(Ceed ceed, const char *source, hipModule_t *module, const CeedInt num_defines, ...) {
   size_t                 ptx_size;
-  char                  *jit_defs_source, *ptx;
-  const char            *jit_defs_path;
+  char                  *ptx;
   const int              num_opts            = 4;
   CeedInt                num_jit_source_dirs = 0;
   const char           **opts;
@@ -77,12 +76,7 @@ int CeedCompile_Hip(Ceed ceed, const char *source, hipModule_t *module, const Ce
   }
 
   // Standard libCEED definitions for HIP backends
-  CeedCallBackend(CeedGetJitAbsolutePath(ceed, "ceed/jit-source/hip/hip-jit.h", &jit_defs_path));
-  CeedCallBackend(CeedLoadSourceToBuffer(ceed, jit_defs_path, &jit_defs_source));
-  code << jit_defs_source;
-  code << "\n\n";
-  CeedCallBackend(CeedFree(&jit_defs_path));
-  CeedCallBackend(CeedFree(&jit_defs_source));
+  code << "#include <ceed/jit-source/hip/hip-jit.h>\n\n";
 
   // Non-macro options
   CeedCallBackend(CeedCalloc(num_opts, &opts));