A load more fixes and improvements

Pencilcaseman · Mar 25, 2024 · b6fd846 · b6fd846
1 parent 75c5ff2
commit b6fd846
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 28 deletions.
diff --git a/build.rs b/build.rs
@@ -147,15 +147,15 @@ fn main() {
         builder = builder.header("./hasty_impl/include/helper/define_opencl.h");
     }
 
-    builder = builder.header("./hasty_impl/include/hasty_impl.h")
-        .clang_arg("-I./hasty_impl/include")
+    builder = builder // .header("./hasty_impl/include/hasty_impl.h")
+        // .clang_arg("-I./hasty_impl/include")
         // .header("./hasty_impl/include/hasty_blas.h")
         .header("./hasty_impl/include/level2/gemv.h")
         .header("./hasty_impl/include/level3/gemm.h")
         // .header("./hasty_impl/include/hasty_opencl.h")
-        .header("./hasty_impl/include/ocl/opencl_error_types.h")
-        .header("./hasty_impl/include/ocl/opencl_configure.h")
-        .header("./hasty_impl/include/ocl/opencl_memory_impl.h");
+        .header("./hasty_impl/include/opencl/opencl_error_types.h")
+        .header("./hasty_impl/include/opencl/opencl_configure.h")
+        .header("./hasty_impl/include/opencl/opencl_memory_impl.h");
 
     let bindings = builder
         .generate()

diff --git a/hasty_impl/CMakeLists.txt b/hasty_impl/CMakeLists.txt
@@ -23,7 +23,7 @@ file(GLOB_RECURSE HASTY_IMPL_SOURCE
 )
 
 add_library(hasty_impl STATIC ${HASTY_IMPL_SOURCE}
-        include/ocl/opencl_memory.hpp
+        include/opencl/opencl_memory.hpp
         src/opencl/opencl_memory.cpp)
 
 target_include_directories(hasty_impl PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")

diff --git a/hasty_impl/include/hasty_impl.h b/hasty_impl/include/hasty_impl.h
@@ -2,8 +2,8 @@
 #define HASTY_IMPL_H
 #ifndef HASTY_IMPL_HAS_BLAS
 
-#include <hasty_blas.h>
-#include <hasty_opencl.h>
+#include "./hasty_blas.h"
+#include "./hasty_opencl.h"
 
 #endif // HASTY_IMPL_HAS_BLAS
 #endif // HASTY_IMPL_H
diff --git a/hasty_impl/include/hasty_opencl.h b/hasty_impl/include/hasty_opencl.h
@@ -2,10 +2,10 @@
 #define HASTY_IMPL_OPENCL_H
 #ifdef HASTY_IMPL_HAS_OPENCL
 
-#include <ocl/opencl_errors.hpp>
-#include <ocl/opencl_global.hpp>
-#include <ocl/opencl_configure.h>
-#include <ocl/opencl_memory.hpp>
+#include "./opencl/opencl_errors.hpp"
+#include "./opencl/opencl_global.hpp"
+#include "./opencl/opencl_configure.h"
+#include "./opencl/opencl_memory.hpp"
 
 #endif // HASTY_IMPL_HAS_OPENCL
 #endif // HASTY_IMPL_OPENCL_H
diff --git a/hasty_impl/include/ocl/opencl.hpp → hasty_impl/include/opencl/opencl.hpp b/hasty_impl/include/ocl/opencl.hpp → hasty_impl/include/opencl/opencl.hpp
diff --git a/hasty_impl/include/ocl/opencl_configure.h → hasty_impl/include/opencl/opencl_configure.h b/hasty_impl/include/ocl/opencl_configure.h → hasty_impl/include/opencl/opencl_configure.h
diff --git a/hasty_impl/include/ocl/opencl_error_types.h → ..._impl/include/opencl/opencl_error_types.h b/hasty_impl/include/ocl/opencl_error_types.h → ..._impl/include/opencl/opencl_error_types.h
diff --git a/hasty_impl/include/ocl/opencl_errors.hpp → hasty_impl/include/opencl/opencl_errors.hpp b/hasty_impl/include/ocl/opencl_errors.hpp → hasty_impl/include/opencl/opencl_errors.hpp
@@ -2,9 +2,9 @@
 #define HASTY_IMPL_OPENCL_ERRORS_HPP
 #ifdef HASTY_IMPL_HAS_OPENCL
 
-#include <ocl/opencl.hpp>
+#include "./opencl.hpp"
 #include <clblast.h>
-#include <ocl/opencl_error_types.h>
+#include "./opencl_error_types.h"
 
 OpenCLErrorCode get_opencl_error_code(int64_t error);
 OpenCLErrorCode getCLBlastErrorCode(clblast::StatusCode status);

diff --git a/hasty_impl/include/ocl/opencl_global.hpp → hasty_impl/include/opencl/opencl_global.hpp b/hasty_impl/include/ocl/opencl_global.hpp → hasty_impl/include/opencl/opencl_global.hpp
@@ -2,7 +2,7 @@
 #define HASTY_IMPL_OPENCL_GLOBAL
 #ifdef HASTY_IMPL_HAS_OPENCL
 
-#include <ocl/opencl.hpp>
+#include "./opencl.hpp"
 
 namespace global {
     extern std::vector<cl::Device> openclDevices;

diff --git a/hasty_impl/include/ocl/opencl_memory.hpp → hasty_impl/include/opencl/opencl_memory.hpp b/hasty_impl/include/ocl/opencl_memory.hpp → hasty_impl/include/opencl/opencl_memory.hpp
@@ -2,11 +2,11 @@
 #define HASTY_IMPL_OPENCL_MEMORY_HPP
 #ifdef HASTY_IMPL_HAS_OPENCL
 
-#include <ocl/opencl.hpp>
-#include <ocl/opencl_error_types.h>
-#include <ocl/opencl_errors.hpp>
-#include <ocl/opencl_global.hpp>
-#include <ocl/opencl_memory_impl.h>
+#include "./opencl.hpp"
+#include "./opencl_error_types.h"
+#include "./opencl_errors.hpp"
+#include "./opencl_global.hpp"
+#include "./opencl_memory_impl.h"
 
 OpenCLErrorCode opencl_allocate(size_t bytes, OpenCLMemoryType mem_type, cl::Buffer **result);
 

diff --git a/hasty_impl/include/ocl/opencl_memory_impl.h → ..._impl/include/opencl/opencl_memory_impl.h b/hasty_impl/include/ocl/opencl_memory_impl.h → ..._impl/include/opencl/opencl_memory_impl.h
@@ -4,7 +4,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <ocl/opencl_error_types.h>
+#include "./opencl_error_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/hasty_impl/src/opencl/opencl_configure.cpp b/hasty_impl/src/opencl/opencl_configure.cpp
@@ -3,9 +3,9 @@
 #include <vector>
 #include <iostream>
 #include <hasty_opencl.h>
-#include <ocl/opencl.hpp>
-#include <ocl/opencl_errors.hpp>
-#include <ocl/opencl_global.hpp>
+#include <opencl/opencl.hpp>
+#include <opencl/opencl_errors.hpp>
+#include <opencl/opencl_global.hpp>
 #include <clblast.h>
 
 int64_t openclDeviceCompute(const cl::Device &device) {

diff --git a/hasty_impl/src/opencl/opencl_errors.cpp b/hasty_impl/src/opencl/opencl_errors.cpp
@@ -1,8 +1,8 @@
 #ifdef HASTY_IMPL_HAS_OPENCL
 
-#include <ocl/opencl.hpp>
+#include <opencl/opencl.hpp>
+#include <opencl/opencl_errors.hpp>
 #include <clblast.h>
-#include <ocl/opencl_errors.hpp>
 #include <map>
 
 //const char *getOpenCLErrorString(int64_t error) {

diff --git a/hasty_impl/src/opencl/opencl_global.cpp b/hasty_impl/src/opencl/opencl_global.cpp
@@ -1,6 +1,6 @@
 #ifdef HASTY_IMPL_HAS_OPENCL
 
-#include <ocl/opencl_global.hpp>
+#include <opencl/opencl_global.hpp>
 
 namespace global {
     std::vector<cl::Device> openclDevices;

diff --git a/hasty_impl/src/opencl/opencl_memory.cpp b/hasty_impl/src/opencl/opencl_memory.cpp
@@ -1,6 +1,6 @@
 #ifdef HASTY_IMPL_HAS_OPENCL
 
-#include <ocl/opencl_memory.hpp>
+#include <opencl/opencl_memory.hpp>
 
 OpenCLErrorCode opencl_allocate(uint64_t bytes, OpenCLMemoryType mem_type, cl::Buffer **result) {
     cl_mem_flags converted_type = -1;