Skip to content

Commit

Permalink
Updated the cookie generated target to refer to oneAPIConstructionKit
Browse files Browse the repository at this point in the history
  • Loading branch information
coldav committed Jun 1, 2023
1 parent 9995bb2 commit 414070d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies, including the oneAPI Construction Kit and the new target:

.. code:: console
$ cd build
$ cd build/oneAPIConstructionKit
$ ninja UnitCL
We can do a quick test, using the environment variable `REFSI_DEBUG` for more information:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ The generated `CMakeLists.txt` is very simple and will look something like this:
"${CMAKE_CURRENT_SOURCE_DIR}/ONEAPI_KIT" CACHE STRING "External oneAPI Construction Kit")
add_subdirectory(${CA_EXTERNAL_ONEAPI_CON_KIT_DIR}
${CMAKE_CURRENT_BINARY_DIR}/oneapi-construction-kit)
${CMAKE_CURRENT_BINARY_DIR}/oneAPIConstructionKit)
The ``CA_EXTERNAL_MUX_TARGET_DIRS`` and ``CA_EXTERNAL_MUX_COMPILER_DIRS`` are
used to tell the oneAPI Construction Kit where to look for for the per target code,
Expand Down
2 changes: 1 addition & 1 deletion examples/technical_blogs/refsi_simple_blog1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ ENV LLVM_INSTALL_NAME=clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04
ENV LLVM_INSTALL_DIR=$BLOG_TOP_LEVEL/$LLVM_INSTALL_NAME
ENV DPCPP_DIR=$BLOG_TOP_LEVEL/dpcpp_compiler
ENV LD_LIBRARY_PATH=$DPCPP_DIR/lib:$LD_LIBRARY_PATH
ENV OCL_ICD_FILENAMES=$BLOG_TOP_LEVEL/refsi_blog/build/ComputeAorta/lib/libCL.so
ENV OCL_ICD_FILENAMES=$BLOG_TOP_LEVEL/refsi_blog/build/oneAPIConstructionKit/lib/libCL.so
ENV ONEAPI_SAMPLES_DIR=$BLOG_TOP_LEVEL/oneAPI-samples
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ cmake -Bbuild \
ninja -Cbuild

# Run a simple UnitCL test
./build/ComputeAorta/bin/UnitCL --gtest_filter=Execution/Execution.Task_01_02_Add/OpenCLC
./build/oneAPIConstructionKit/bin/UnitCL --gtest_filter=Execution/Execution.Task_01_02_Add/OpenCLC

CA_HAL_DEBUG=1 ./build/ComputeAorta/bin/UnitCL --gtest_filter=Execution/Execution.Task_01_02_Add/OpenCLC
CA_HAL_DEBUG=1 ./build/oneAPIConstructionKit/bin/UnitCL --gtest_filter=Execution/Execution.Task_01_02_Add/OpenCLC

# Build the SYCL vector add test
$DPCPP_DIR/bin/clang++ -fsycl $ONEAPI_SAMPLES_DIR/DirectProgramming/C++SYCL/DenseLinearAlgebra/vector-add/src/vector-add-buffers.cpp -o build/simple_add
Expand Down
4 changes: 2 additions & 2 deletions external/cookie/{{cookiecutter.external_dir}}/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ set(CA_EXTERNAL_MUX_COMPILER_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/compiler/{{cookie
CACHE STRING "override" FORCE)

set(CA_EXTERNAL_{{cookiecutter.target_name_capitals}}_HAL_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/hal_{{cookiecutter.target_name}}" CACHE STRING "External ComputeAorta HAL")
"${CMAKE_CURRENT_SOURCE_DIR}/hal_{{cookiecutter.target_name}}" CACHE STRING "External oneAPI Construction Kit HAL")

set(CA_EXTERNAL_ONEAPI_CON_KIT_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/ONEAPI_KIT" CACHE STRING "External oneAPI Construction Kit")

add_subdirectory(${CA_EXTERNAL_ONEAPI_CON_KIT_DIR}
${CMAKE_CURRENT_BINARY_DIR}/ComputeAorta)
${CMAKE_CURRENT_BINARY_DIR}/oneAPIConstructionKit)

0 comments on commit 414070d

Please sign in to comment.