clean-up overlooked #define.

Signed-off-by: Chris Perkins <[email protected]>

Author: cperkinsintel

sycl/include/CL/sycl/detail/cl.h

@@ -14,6 +14,5 @@
 #define CL_TARGET_OPENCL_VERSION 220
 #endif
 
-
 #include <CL/cl.h>
 #include <CL/cl_ext.h>

sycl/include/CL/sycl/detail/image_impl.hpp

@@ -80,24 +80,9 @@ class __SYCL_EXPORT image_impl final : public SYCLMemObjT {
 
   void setPitches() {
     size_t WHD[3] = {1, 1, 1}; // Width, Height, Depth.
-#ifndef CP_CHANGE_IMAGE
     for (int I = 0; I < Dimensions; I++)
       WHD[I] = MRange[I];
-#else
-    // MRange is [width], [height, width] or [depth, height, width]
-    if (Dimensions == 1) {
-      WHD[0] = MRange[0];
-    }
-    if (Dimensions == 2) {
-      WHD[0] = MRange[1];
-      WHD[1] = MRange[0];
-    }
-    if (Dimensions == 3) {
-      WHD[0] = MRange[2];
-      WHD[1] = MRange[1];
-      WHD[2] = MRange[0];
-    }
-#endif
+
     MRowPitch = MElementSize * WHD[0];
     MSlicePitch = MRowPitch * WHD[1];
     BaseT::MSizeInBytes = MSlicePitch * WHD[2];
@@ -109,12 +94,9 @@ class __SYCL_EXPORT image_impl final : public SYCLMemObjT {
     MSlicePitch =
         (Dimensions == 3) ? Pitch[1] : MRowPitch; // Dimensions will be 2/3.
     // NumSlices is depth when dim==3, and height when dim==2.
-#ifndef CP_CHANGE_IMAGE
     size_t NumSlices =
         (Dimensions == 3) ? MRange[2] : MRange[1]; // Dimensions will be 2/3.
-#else
-    size_t NumSlices = (Dimensions == 3) ? MRange[0] : 1;
-#endif
+
     BaseT::MSizeInBytes = MSlicePitch * NumSlices;
   }
 

sycl/plugins/opencl/pi_opencl.cpp

@@ -535,6 +535,7 @@ pi_result piMemImageCreate(pi_context context, pi_mem_flags flags,
                     cast<const cl_image_format *>(image_format),
                     cast<const cl_image_desc *>(image_desc), host_ptr,
                     cast<cl_int *>(&ret_err)));
+
   return ret_err;
 }
 

sycl/source/detail/memory_manager.cpp

@@ -257,11 +257,8 @@ void prepTermPositions(term_positions &pos, int Dimensions,
   //  2 ==>  {height, width, 1}
   //  3 ==>  {depth, height, width}
   // Some callers enqueue 0 as DimDst/DimSrc.
-#ifdef CP_CHANGE_IMAGE
-  if (true) {
-#else
+
   if (type == detail::SYCLMemObjI::MemObjType::BUFFER) {
-#endif
     if (Dimensions == 3) {
       pos.x_term = 2, pos.y_term = 1, pos.z_term = 0;
     } else if (Dimensions == 2) {