Skip to content

Commit

Permalink
Revert "OpenCL: build against 2.0"
Browse files Browse the repository at this point in the history
This reverts commit 9b22cdd.
  • Loading branch information
aurelienpierre committed Jan 15, 2025
1 parent 58b4c0f commit 65e7e1d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion data/kernels/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ macro(testcompile_opencl_kernel IN)

add_custom_command(
OUTPUT ${TOUCH}
COMMAND ${CLANG_OPENCL_COMPILER} -cc1 -cl-std=CL2.0 -isystem ${CLANG_OPENCL_INCLUDE_DIR} -finclude-default-header -I${CMAKE_CURRENT_SOURCE_DIR} ${IN}
COMMAND ${CLANG_OPENCL_COMPILER} -cc1 -cl-std=CL1.2 -isystem ${CLANG_OPENCL_INCLUDE_DIR} -finclude-default-header -I${CMAKE_CURRENT_SOURCE_DIR} ${IN}
COMMAND ${CMAKE_COMMAND} -E touch ${TOUCH} # will be empty!
DEPENDS ${IN}
COMMENT "Test-compiling OpenCL program ${KERNAME}"
Expand Down
2 changes: 1 addition & 1 deletion src/common/opencl.c
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ static int dt_opencl_device_init(dt_opencl_t *cl, const int dev, cl_device_id *d
gchar *my_option = g_strdup(compile_opt);
dt_conf_set_string(compile_option_name_cname, my_option);

cl->dev[dev].options = g_strdup_printf("-cl-std=CL2.0 -w %s %s -D%s=1 -I%s",
cl->dev[dev].options = g_strdup_printf("-w %s %s -D%s=1 -I%s",
my_option,
(cl->dev[dev].nvidia_sm_20 ? " -DNVIDIA_SM_20=1" : ""),
dt_opencl_get_vendor_by_id(vendor_id), escapedkerneldir);
Expand Down

0 comments on commit 65e7e1d

Please sign in to comment.