From 4f3bb3bc5f1e3f8f3a5c8191a0ea5881c08531f7 Mon Sep 17 00:00:00 2001 From: Kristi Belcher Date: Mon, 7 Oct 2024 12:47:50 -0700 Subject: [PATCH 1/3] getting rid of a couple warnings --- src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp b/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp index bb2137951..0e9fca157 100644 --- a/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp +++ b/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp @@ -36,12 +36,12 @@ std::unique_ptr SyclUnifiedMemoryResourceFactory::crea std::rethrow_exception(e); } catch (sycl::exception const& ex) { std::cout << "Caught asynchronous SYCL exception:" << std::endl - << ex.what() << ", OpenCL code: " << ex.get_cl_code() << std::endl; + << ex.what() << ", SYCL code: " << ex.code() << std::endl; } } }; - sycl::platform platform(sycl::gpu_selector{}); + sycl::platform platform(sycl::gpu_selector_v{}); int device_count = 0; // SYCL multi.device count auto const& devices = platform.get_devices(); @@ -76,7 +76,7 @@ MemoryResourceTraits SyclUnifiedMemoryResourceFactory::getDefaultTraits() { MemoryResourceTraits traits; - sycl::device syclDev(sycl::gpu_selector{}); + sycl::device syclDev(sycl::gpu_selector_v{}); if (syclDev.is_gpu()) { if (syclDev.get_info() > 0) { auto subDevicesDomainNuma = From bb767a2d4170c9d0b167096a8f8ccb831a48d106 Mon Sep 17 00:00:00 2001 From: Kristi Belcher Date: Mon, 7 Oct 2024 14:55:48 -0700 Subject: [PATCH 2/3] trying this instead --- src/umpire/resource/SyclPinnedMemoryResourceFactory.cpp | 2 +- src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/umpire/resource/SyclPinnedMemoryResourceFactory.cpp b/src/umpire/resource/SyclPinnedMemoryResourceFactory.cpp index 592d54690..6654ee542 100644 --- a/src/umpire/resource/SyclPinnedMemoryResourceFactory.cpp +++ b/src/umpire/resource/SyclPinnedMemoryResourceFactory.cpp @@ -41,7 +41,7 @@ std::unique_ptr SyclPinnedMemoryResourceFactory::creat } }; - sycl::platform platform(sycl::gpu_selector{}); + sycl::platform platform(sycl::gpu_selector_v()); int device_count = 0; // SYCL multi.device count auto const& devices = platform.get_devices(); diff --git a/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp b/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp index 0e9fca157..1bba4195c 100644 --- a/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp +++ b/src/umpire/resource/SyclUnifiedMemoryResourceFactory.cpp @@ -41,7 +41,7 @@ std::unique_ptr SyclUnifiedMemoryResourceFactory::crea } }; - sycl::platform platform(sycl::gpu_selector_v{}); + sycl::platform platform(sycl::gpu_selector_v()); int device_count = 0; // SYCL multi.device count auto const& devices = platform.get_devices(); @@ -76,7 +76,7 @@ MemoryResourceTraits SyclUnifiedMemoryResourceFactory::getDefaultTraits() { MemoryResourceTraits traits; - sycl::device syclDev(sycl::gpu_selector_v{}); + sycl::device syclDev(sycl::gpu_selector_v()); if (syclDev.is_gpu()) { if (syclDev.get_info() > 0) { auto subDevicesDomainNuma = From bbe33384182302e63cd363c47d767c93abdd7ea2 Mon Sep 17 00:00:00 2001 From: Kristi Belcher Date: Mon, 7 Oct 2024 15:05:26 -0700 Subject: [PATCH 3/3] update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 687c2f779..e73910392 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ ENV GTEST_COLOR=1 COPY . /home/umpire/workspace WORKDIR /home/umpire/workspace/build RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ - cmake -DCMAKE_CXX_COMPILER=dpcpp -DCMAKE_C_COMPILER=icx -DENABLE_WARNINGS_AS_ERRORS=Off -DUMPIRE_ENABLE_DEVELOPER_DEFAULTS=On -DUMPIRE_ENABLE_SYCL=On .. && \ + cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_FLAGS=-fsycl -DENABLE_WARNINGS_AS_ERRORS=Off -DUMPIRE_ENABLE_DEVELOPER_DEFAULTS=On -DUMPIRE_ENABLE_SYCL=On .. && \ make -j 16" FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel