Merge pull request #76 from mateuszpn/include-fix

rmukhopa · web-flow · commit b22215c16f78 · 2024-10-08T09:05:53.000-07:00
Fix of &lt;sycl.hpp&gt; includes
diff --git a/dl-cifar/SYCL/basic-dl/lnorm_layer.h b/dl-cifar/SYCL/basic-dl/lnorm_layer.h
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #include "tracing.h"
 #include "timing.h"
diff --git a/dl-cifar/SYCL/basic-dl/softmax_layer.h b/dl-cifar/SYCL/basic-dl/softmax_layer.h
@@ -24,12 +24,12 @@
 #ifndef DL_CIFAR_SOFTMAX_LAYER_H_
 #define DL_CIFAR_SOFTMAX_LAYER_H_
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "timing.h"
 #include "tracing.h"
 #include "handle.h"
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #if defined(USE_CUBLAS)
 #include <cublas_v2.h>
diff --git a/dl-cifar/SYCL/blas_routines.h b/dl-cifar/SYCL/blas_routines.h
@@ -31,7 +31,7 @@
 #include "tracing.h"
 #include "handle.h"
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 
 #if defined(USE_CUBLAS)
diff --git a/dl-cifar/SYCL/handle.h b/dl-cifar/SYCL/handle.h
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <string>
 #include "timing.h"
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #if defined(USE_CUBLAS)
 #include <cublas_v2.h>
diff --git a/dl-cifar/SYCL/upsample.h b/dl-cifar/SYCL/upsample.h
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #include "tracing.h"
 #include "timing.h"
diff --git a/dl-mnist/SYCL/tensor_mgr.onednn.h b/dl-mnist/SYCL/tensor_mgr.onednn.h
@@ -31,7 +31,7 @@
 #include <list>
 #include <array>
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "oneapi/dnnl/dnnl.hpp"
 #include "../common/workload_params.h"
 
diff --git a/easywave/SYCL/src/EasyWave.cpp b/easywave/SYCL/src/EasyWave.cpp
@@ -48,7 +48,7 @@
 #include "Utilities.h"
 #include "Timer.h"
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/easywave/SYCL/src/ewCudaKernels.cpp b/easywave/SYCL/src/ewCudaKernels.cpp
@@ -12,7 +12,7 @@
 
 #include "ewCudaKernels.hpp"
 #include "ewGpuNode.hpp"
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <cmath>
 
 SYCL_EXTERNAL __attribute__((always_inline)) void waveUpdate(KernelData data, sycl::nd_item<2> item_ct1)
diff --git a/easywave/SYCL/src/ewCudaKernels.hpp b/easywave/SYCL/src/ewCudaKernels.hpp
@@ -13,7 +13,7 @@
 #ifndef EW_CUDA_KERNELS
 #define EW_CUDA_KERNELS
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "ewGpuNode.hpp"
 
 #ifdef USE_INLINE_KERNELS
diff --git a/easywave/SYCL/src/ewGpuNode.cpp b/easywave/SYCL/src/ewGpuNode.cpp
@@ -44,7 +44,7 @@
 #define CPP_MODULE "CGPU"
 #include "Logging.h"
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "ewCudaKernels.hpp"
 #include "ewGpuNode.hpp"
 #include <cmath>
diff --git a/easywave/SYCL/src/ewGpuNode.hpp b/easywave/SYCL/src/ewGpuNode.hpp
@@ -46,7 +46,7 @@
 #define EW_GPUNODE_H
 
 /* FIXME: check header dependencies */
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <stdio.h>
 #include <utility>
 
diff --git a/ethminer/libethash-sycl/SYCLMiner.cpp b/ethminer/libethash-sycl/SYCLMiner.cpp
@@ -36,7 +36,7 @@ You should have received a copy of the GNU General Public License
 along with ethminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <libethcore/Farm.h>
 #include <ethash/ethash.hpp>
 
diff --git a/ethminer/libethash-sycl/SYCLMiner.h b/ethminer/libethash-sycl/SYCLMiner.h
@@ -38,7 +38,7 @@ along with ethminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "ethash_sycl_miner_kernel.h"
 
 #include <libdevcore/Worker.h>
diff --git a/ethminer/libethash-sycl/dagger_shuffled.dp.hpp b/ethminer/libethash-sycl/dagger_shuffled.dp.hpp
@@ -19,7 +19,7 @@
  * 
  */ 
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "ethash_sycl_miner_kernel_globals.h"
 
 #include "ethash_sycl_miner_kernel.h"
diff --git a/ethminer/libethash-sycl/dpcpp_helper.h b/ethminer/libethash-sycl/dpcpp_helper.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #define __dpct_inline__ __inline__ __attribute__((always_inline))
 #define DEV_INLINE      __dpct_inline__
diff --git a/ethminer/libethash-sycl/ethash_sycl_miner_kernel.cpp b/ethminer/libethash-sycl/ethash_sycl_miner_kernel.cpp
@@ -19,7 +19,7 @@
  * 
  */ 
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "SYCLMiner.h"
 #include "ethash_sycl_miner_kernel.h"
 
diff --git a/ethminer/libethash-sycl/ethash_sycl_miner_kernel.h b/ethminer/libethash-sycl/ethash_sycl_miner_kernel.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <stdint.h>
 #include <sstream>
 #include <stdexcept>
diff --git a/ethminer/libethash-sycl/ethash_sycl_miner_kernel_globals.h b/ethminer/libethash-sycl/ethash_sycl_miner_kernel_globals.h
@@ -19,7 +19,7 @@
  * 
  */ 
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <vector>
 #pragma once
 
diff --git a/ethminer/libethash-sycl/fnv.dp.hpp b/ethminer/libethash-sycl/fnv.dp.hpp
@@ -19,7 +19,7 @@
  * 
  */ 
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #define FNV_PRIME 0x01000193
 
 #define fnv(x, y) ((x)*FNV_PRIME ^ (y))
diff --git a/ethminer/libethash-sycl/keccak.dp.hpp b/ethminer/libethash-sycl/keccak.dp.hpp
@@ -19,7 +19,7 @@
  * 
  */ 
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include "dpcpp_helper.h"
 
 DEV_INLINE sycl::uint2 xor5(const sycl::uint2 a, const sycl::uint2 b, const sycl::uint2 c, const sycl::uint2 d, const sycl::uint2 e)
diff --git a/infrastructure/SYCL.h b/infrastructure/SYCL.h
@@ -41,7 +41,7 @@
 
 #include "CommandLineParser.h"
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <string>
 #include <vector>
 
diff --git a/lc0/src/neural/sycl/cuBlasContext.h b/lc0/src/neural/sycl/cuBlasContext.h
@@ -45,7 +45,7 @@
 */
 
 #include <iostream>
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #ifdef USE_CUBLAS
 
diff --git a/reverse_time_migration/libs/SeismicOperations/include/operations/backend/OneAPIBackend.hpp b/reverse_time_migration/libs/SeismicOperations/include/operations/backend/OneAPIBackend.hpp
@@ -18,7 +18,7 @@
 #define OPERATIONS_LIB_BACKEND_ONEAPI_BACKEND_HPP
 
 #include <operations/common/Singleton.tpp>
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 namespace operations {
     namespace backend {
diff --git a/reverse_time_migration/src/generators/concrete/computation-parameters/oneapi/computation_parameters_generator.cpp b/reverse_time_migration/src/generators/concrete/computation-parameters/oneapi/computation_parameters_generator.cpp
@@ -29,7 +29,7 @@
 #include <set>
 #include <unistd.h>
 
-#include <sycl.hpp>
+#include <sycl/sycl.hpp>
 
 using namespace std;
 using namespace operations::common;
