From 681150254f8c103c9baeafcf05d48e10e62c96ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Petit?= Date: Tue, 11 Feb 2020 09:04:46 +0000 Subject: [PATCH] Remove some dead code (#586) Signed-off-by: Kevin Petit --- CMakeLists.txt | 9 ------ test_conformance/events/test_userevents.cpp | 31 --------------------- 2 files changed, 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18181d61..da4ffdbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,16 +16,7 @@ else(CMAKE_BUILD_TYPE STREQUAL "release") set (BUILD_FLAVOR "debug") endif(CMAKE_BUILD_TYPE STREQUAL "release") -set(CLConform_VERSION_MAJOR "2") -set(CLConform_VERSION_MINOR "2") -set(CLConform_VERSION_MICRO "0") -set(CLConform_VERSION_EXTRA "") -set(CLConform_VERSION "${CLConform_VERSION_MAJOR}.${CLConform_VERSION_MINOR}") -set(CLConform_VERSION_FULL - "${CLConform_VERSION}.${CLConform_VERSION_MICRO}${CLConform_VERSION_EXTRA}") - add_definitions(-DCL_TARGET_OPENCL_VERSION=220) - add_definitions(-DCL_USE_DEPRECATED_OPENCL_2_1_APIS=1) add_definitions(-DCL_USE_DEPRECATED_OPENCL_2_0_APIS=1) add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_2_APIS=1) diff --git a/test_conformance/events/test_userevents.cpp b/test_conformance/events/test_userevents.cpp index 66ac7acb..6853273d 100644 --- a/test_conformance/events/test_userevents.cpp +++ b/test_conformance/events/test_userevents.cpp @@ -48,37 +48,6 @@ /////////////////////////////////////////////////////////////////////////////// // CL error checking. -#define CL_DEVICE_TYPE_ENV_MUST_BE( bitfield_ )\ -{\ -cl_device_type device_type = CL_DEVICE_TYPE_DEFAULT;\ -const char* device_env = getenv("CL_DEVICE_TYPE");\ -if (device_env != NULL) {\ -if (!strcmp( device_env, "gpu" ) || !strcmp( device_env, "CL_DEVICE_TYPE_GPU" ))\ -device_type = CL_DEVICE_TYPE_GPU;\ -else if(!strcmp( device_env, "cpu" ) || !strcmp( device_env, "CL_DEVICE_TYPE_CPU" ))\ -device_type = CL_DEVICE_TYPE_CPU;\ -else if(!strcmp( device_env, "default" ) || !strcmp( device_env, "CL_DEVICE_TYPE_DEFAULT" ))\ -device_type = CL_DEVICE_TYPE_DEFAULT;\ -if (!(device_type & bitfield_)) {\ -log_error( "CL_DEVICE_TYPE environment variable \"%s\" must be \"%s\".", device_env, #bitfield_ );\ -abort();\ -}\ -}\ -}\ - -#define CL_DEVICE_TYPE_ENV( device_type_ )\ -{\ -const char* device_env = getenv("CL_DEVICE_TYPE");\ -if (device_env != NULL) {\ -if (!strcmp( device_env, "gpu" ) || !strcmp( device_env, "CL_DEVICE_TYPE_GPU" ))\ -device_type_ = CL_DEVICE_TYPE_GPU;\ -else if(!strcmp( device_env, "cpu" ) || !strcmp( device_env, "CL_DEVICE_TYPE_CPU" ))\ -device_type_ = CL_DEVICE_TYPE_CPU;\ -else if(!strcmp( device_env, "default" ) || !strcmp( device_env, "CL_DEVICE_TYPE_DEFAULT" ))\ -device_type_ = CL_DEVICE_TYPE_DEFAULT;\ -}\ -} - #if defined(_MSC_VER) #define CL_EXIT_ERROR(cmd,...) \ { \