DPPL shared objects are installed into dpctl/ not in lib/

Updated build scripts to account for move of DPPL*Interface dynamic libraries
from environment lib to site-packages/dpctl/

Author: oleksandr-pavlyk

conda-recipe/bld.bat

@@ -10,7 +10,10 @@ rmdir /S /Q build_cmake
 mkdir build_cmake
 cd build_cmake
 
-set "DPCPP_ROOT=%ONEAPI_ROOT%/compiler/latest/windows"
+set "DPCPP_ROOT=%ONEAPI_ROOT%\compiler\latest\windows"
+set "INSTALL_PREFIX=%cd%\..\install"
+
+rmdir /S /Q "%INSTALL_PREFIX%"
 
 cmake -G Ninja ^
     -DCMAKE_BUILD_TYPE=Release ^
@@ -25,19 +28,23 @@ ninja install
 IF %ERRORLEVEL% NEQ 0 exit 1
 
 cd ..
+xcopy install\lib\*.lib dpctl /E /Y
+xcopy install\lib\*.dll dpctl /E /Y
+
 mkdir dpctl\include
 xcopy backends\include dpctl\include /E /Y
 
+
+
 REM required by dpglue
-set "DPPL_OPENCL_INTERFACE_LIBDIR=%LIBRARY_PREFIX%/lib"
-set "DPPL_OPENCL_INTERFACE_INCLDIR=%LIBRARY_PREFIX%/include"
-set "OpenCL_LIBDIR=%DPCPP_ROOT%/lib"
+set "DPPL_OPENCL_INTERFACE_LIBDIR=dpctl"
+set "DPPL_OPENCL_INTERFACE_INCLDIR=dpctl\include"
+set "OpenCL_LIBDIR=%DPCPP_ROOT%\lib"
 
 REM required by oneapi_interface
-set "DPPL_SYCL_INTERFACE_LIBDIR=%LIBRARY_PREFIX%/lib"
-set "DPPL_SYCL_INTERFACE_INCLDIR=%LIBRARY_PREFIX%/include"
+set "DPPL_SYCL_INTERFACE_LIBDIR=dpctl"
+set "DPPL_SYCL_INTERFACE_INCLDIR=dpctl\include"
 
 "%PYTHON%" setup.py clean --all
-"%PYTHON%" setup.py build
-"%PYTHON%" setup.py install
+"%PYTHON%" setup.py build install
 IF %ERRORLEVEL% NEQ 0 exit 1

conda-recipe/build.sh

@@ -13,7 +13,10 @@ fi
 
 rm -rf build_cmake
 mkdir build_cmake
-cd build_cmake
+pushd build_cmake
+
+INSTALL_PREFIX=`pwd`/../install
+rm -rf ${INSTALL_PREFIX}
 
 PYTHON_INC=`${PYTHON} -c "import distutils.sysconfig;                  \
                         print(distutils.sysconfig.get_python_inc())"`
@@ -22,27 +25,29 @@ DPCPP_ROOT=${ONEAPI_ROOT}/compiler/latest/linux/
 
 cmake                                                       \
     -DCMAKE_BUILD_TYPE=Release                              \
-    -DCMAKE_INSTALL_PREFIX=${PREFIX}                        \
-    -DCMAKE_PREFIX_PATH=${PREFIX}                           \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}                \
+    -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX}                   \
     -DDPCPP_ROOT=${DPCPP_ROOT}                              \
     -DPYTHON_INCLUDE_DIR=${PYTHON_INC}                      \
     -DNUMPY_INCLUDE_DIR=${NUMPY_INC}                        \
     ../backends
 
 make -j 4 && make install
 
-cd ..
+popd
+cp install/lib/*.so dpctl/
+
 mkdir -p dpctl/include
 cp -r backends/include/* dpctl/include
 
 # required by dpctl.opencl_core
-export DPPL_OPENCL_INTERFACE_LIBDIR=${PREFIX}
-export DPPL_OPENCL_INTERFACE_INCLDIR=${PREFIX}/include
-export OpenCL_LIBDIR=${DPCPP_ROOT}/lib
+export DPPL_OPENCL_INTERFACE_LIBDIR=dpctl
+export DPPL_OPENCL_INTERFACE_INCLDIR=dpctl/include
+export OpenCL_LIBDIR=${DPCPP_ROOT}/libw
 
 # required by dpctl.sycl_core
-export DPPL_SYCL_INTERFACE_LIBDIR=${PREFIX}/lib
-export DPPL_SYCL_INTERFACE_INCLDIR=${PREFIX}/include
+export DPPL_SYCL_INTERFACE_LIBDIR=dpctl
+export DPPL_SYCL_INTERFACE_INCLDIR=dpctl/include
 
 
 # FIXME: How to pass this using setup.py? This flags is needed when

scripts/build_for_develop.sh

@@ -7,10 +7,11 @@ pushd build_cmake
 INSTALL_PREFIX=`pwd`/../install
 rm -rf ${INSTALL_PREFIX}
 export ONEAPI_ROOT=/opt/intel/oneapi
-DPCPP_ROOT=${ONEAPI_ROOT}/compiler/latest/linux
+
 PYTHON_INC=`python -c "import distutils.sysconfig;                  \
                         print(distutils.sysconfig.get_python_inc())"`
 NUMPY_INC=`python -c "import numpy; print(numpy.get_include())"`
+DPCPP_ROOT=${ONEAPI_ROOT}/compiler/latest/linux
 
 cmake                                                       \
     -DCMAKE_BUILD_TYPE=Debug                                \
@@ -33,7 +34,8 @@ cp -r backends/include/* dpctl/include
 
 export DPPL_OPENCL_INTERFACE_LIBDIR=dpctl
 export DPPL_OPENCL_INTERFACE_INCLDIR=dpctl/include
-export OpenCL_LIBDIR=/usr/lib/x86_64-linux-gnu/
+# /usr/lib/x86_64-linux-gnu/
+export OpenCL_LIBDIR=${DPCPP_ROOT}/lib
 export DPPL_SYCL_INTERFACE_LIBDIR=dpctl
 export DPPL_SYCL_INTERFACE_INCLDIR=dpctl/include