Jingxu10/cppsdk 20 (#1461)

* refine cppsdk

* rename installer.sh to run

Author: jingxu10

cmake/IPEXConfig.cmake.in cmake/cppsdk/IPEXConfig.cmake.incmake/IPEXConfig.cmake.in renamed to cmake/cppsdk/IPEXConfig.cmake.in

@@ -3,7 +3,8 @@
 #
 # Finds the Torch IPEX library
 #
-# This will define the following variables:
+# This will define the following variables. The last 3 are appended to the
+# TORCH counterpart variables respectively.
 #
 #   IPEX_FOUND        -- True if the system has the Torch IPEX library
 #   IPEX_INCLUDE_DIRS -- The include directories for torch
@@ -17,6 +18,8 @@
 
 include(FindPackageHandleStandardArgs)
 
+FIND_PACKAGE(Torch REQUIRED)
+
 if(DEFINED ENV{IPEX_INSTALL_PREFIX})
   set(IPEX_INSTALL_PREFIX $ENV{IPEX_INSTALL_PREFIX})
 else()
@@ -28,17 +31,20 @@ endif()
 # Include directories.
 if(EXISTS "${IPEX_INSTALL_PREFIX}/include")
   set(IPEX_INCLUDE_DIRS ${IPEX_INSTALL_PREFIX}/include)
+  list(APPEND TORCH_INCLUDE_DIRS ${IPEX_INCLUDE_DIRS})
 endif()
 
 # Library dependencies.
 if(@BUILD_WITH_CPU@)
   find_library(IPEX_CPU_CORE_LIBRARY intel-ext-pt-cpu PATHS "${IPEX_INSTALL_PREFIX}/lib")
   set(IPEX_LIBRARIES ${IPEX_CPU_CORE_LIBRARY})
+  list(APPEND TORCH_LIBRARIES ${IPEX_CPU_CORE_LIBRARY})
 endif()
 
 if(@BUILD_WITH_XPU@)
   find_library(IPEX_GPU_CORE_LIBRARY intel-ext-pt-gpu PATHS "${IPEX_INSTALL_PREFIX}/lib")
   list(APPEND IPEX_LIBRARIES ${IPEX_GPU_CORE_LIBRARY})
+  list(APPEND TORCH_LIBRARIES ${IPEX_GPU_CORE_LIBRARY})
 endif()
 
 find_package_handle_standard_args(IPEX DEFAULT_MSG IPEX_LIBRARIES IPEX_INCLUDE_DIRS)

cmake/cppsdk/libintel-ext-pt.installer.sh.in

@@ -118,6 +118,20 @@ elif [[ ${COMMAND} == "uninstall" ]]; then
         fi
     done
 
+    if [ -f ${LIBTORCH_PATH}/lib/libintel-ext-pt-cpu.so ]; then
+        rm -rf ${LIBTORCH_PATH}/lib/libintel-ext-pt-cpu.so
+    fi
+    if [ -f ${LIBTORCH_PATH}/lib/libintel-ext-pt-gpu.so ]; then
+        rm -rf ${LIBTORCH_PATH}/lib/libintel-ext-pt-gpu.so
+    fi
+
+    if [ -f ${LIBTORCH_PATH}/include/ipex.h ]; then
+        rm -rf ${LIBTORCH_PATH}/include/ipex.h
+    fi
+    if [ -d ${LIBTORCH_PATH}/include/xpu ]; then
+        rm -rf ${LIBTORCH_PATH}/include/xpu
+    fi
+
     if [ -d ${LIBTORCH_PATH}/share/cmake/IPEX ]; then
         rm -rf ${LIBTORCH_PATH}/share/cmake/IPEX
     fi

csrc/CMakeLists.txt

@@ -14,7 +14,7 @@ set(LIBIPEX_COMP_LIST)
 include(CMakePackageConfigHelpers)
 # CMake config file for the external project.
 configure_package_config_file(
-  ${IPEX_ROOT_DIR}/cmake/IPEXConfig.cmake.in
+  ${IPEX_ROOT_DIR}/cmake/cppsdk/IPEXConfig.cmake.in
   ${PROJECT_BINARY_DIR}/IPEXConfig.cmake
   INSTALL_DESTINATION share/cmake/IPEX)
 
@@ -71,9 +71,9 @@ if(BUILD_MODULE_TYPE STREQUAL "CPPSDK")
 
   include(CPack)
 
-  set(INSTALL_SCRIPT "libintel-ext-pt-${CMAKE_PROJECT_VERSION}.installer.sh")
+  set(INSTALL_SCRIPT "libintel-ext-pt-${CMAKE_PROJECT_VERSION}.run")
   if(GLIBCXX_USE_CXX11_ABI)
-    set(INSTALL_SCRIPT "libintel-ext-pt-cxx11-abi-${CMAKE_PROJECT_VERSION}.installer.sh")
+    set(INSTALL_SCRIPT "libintel-ext-pt-cxx11-abi-${CMAKE_PROJECT_VERSION}.run")
   endif()
   configure_package_config_file(
     ${IPEX_ROOT_DIR}/cmake/cppsdk/libintel-ext-pt.installer.sh.in