fixes for ONSAM-1439 to address changes in oneccl 2021.5 release (#776)

* change cpu_icc to cpu for 2021.5 release

* new backend cmake configuration

Co-authored-by: alexeyboreiko <[email protected]>

Author: 2 people

Libraries/oneCCL/oneCCL_Getting_Started/README.md

@@ -79,7 +79,7 @@ You can refer to this page [oneAPI](https://software.intel.com/en-us/oneapi) for
   ex : /opt/intel/oneapi \
   Don't need to replace {DPCPP_CMPLR_ROOT}
   ```
-  source ${ONEAPI_ROOT}/setvars.sh --ccl-configuration=cpu_icc
+  source ${ONEAPI_ROOT}/setvars.sh --ccl-configuration=cpu
 
   cd oneapi-toolkit/oneCCL/oneCCL_Getting_Started
   mkdir build
@@ -102,7 +102,7 @@ Users can rebuild the cpu_allreduce_test.cpp by typing "make cpu_allreduce_test"
   cd oneapi-toolkit/oneCCL/oneCCL_Getting_Started
   mkdir build
   cd build
-  cmake ..  -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=dpcpp
+  cmake ..  -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=dpcpp -DCOMPUTE_BACKEND=dpcpp_level_zero
   make sycl_allreduce_test
   ```
 > NOTE: The source file "sycl_allreduce_test.cpp" will be copied from ${INTEL_ONEAPI_INSTALL_FOLDER}/ccl/latest/examples/sycl to build/src/sycl folder.

Libraries/oneCCL/oneCCL_Getting_Started/sample.json

@@ -17,7 +17,7 @@
 		"steps": [
 			"mkdir build",
       		        "cd build",
-           		"cmake .. -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=dpcpp",
+           		"cmake .. -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=dpcpp -DCOMPUTE_BACKEND=dpcpp_level_zero",
            		"make",
 			"mpirun -n 2 ./out/sycl/sycl_allreduce_test cpu",
 			"mpirun -n 2 ./out/sycl/sycl_allreduce_test gpu"

Libraries/oneCCL/tutorials/oneCCL_Getting_Started.ipynb

@@ -188,8 +188,8 @@
     "if(${CMAKE_CXX_COMPILER_ID} STREQUAL \"GNU\")\n",
     "    file(GLOB sources \"cpu_*.c\" \"cpu_*.cpp\")\n",
     "    set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} ${CMAKE_CLANG_FLAGS} -std=c++11\")\n",
-    "    set(CCL_INCLUDE_DIR \"$ENV{CCL_ROOT}/include/cpu_icc\")\n",
-    "    set(CCL_LIB_DIR \"$ENV{CCL_ROOT}/lib/cpu_icc\")\n",
+    "    set(CCL_INCLUDE_DIR \"$ENV{CCL_ROOT}/include/cpu\")\n",
+    "    set(CCL_LIB_DIR \"$ENV{CCL_ROOT}/lib/cpu\")\n",
     "    foreach(src ${sources})\n",
     "        include_directories(${CCL_INCLUDE_DIR})\n",
     "        include_directories(${CCL_TEST_INCLUDE_DIR})\n",
@@ -257,7 +257,7 @@
    "source": [
     "%%writefile build.sh\n",
     "#!/bin/bash\n",
-    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu_icc --force > /dev/null 2>&1\n",
+    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu --force > /dev/null 2>&1\n",
     "export EXAMPLE_ROOT=./lab/\n",
     "mkdir cpu_gomp\n",
     "cd cpu_gomp\n",
@@ -274,7 +274,7 @@
     "\n",
     "#### Script - run.sh\n",
     "the script **run.sh** encapsulates the program for submission to the job queue for execution.\n",
-    "The user must switch to the g++ oneCCL configuration by inputting a custom configuration \"--ccl-configuration=cpu_icc\" when running \"source setvars.sh\".\n"
+    "The user must switch to the g++ oneCCL configuration by inputting a custom configuration \"--ccl-configuration=cpu\" when running \"source setvars.sh\".\n"
    ]
   },
   {
@@ -285,7 +285,7 @@
    "source": [
     "%%writefile run.sh\n",
     "#!/bin/bash\n",
-    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu_icc --force > /dev/null 2>&1\n",
+    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu --force > /dev/null 2>&1\n",
     "echo \"########## Executing the run\"\n",
     "./cpu_gomp/out/cpu_allreduce_cpp_test\n",
     "echo \"########## Done with the run\"\n",
@@ -337,7 +337,7 @@
    "source": [
     "%%writefile vtune_collect.sh\n",
     "#!/bin/bash\n",
-    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu_icc --force \n",
+    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu --force \n",
     "type=hotspots\n",
     "\n",
     "rm -r $(pwd)/vtune_data\n",
@@ -408,7 +408,7 @@
    "source": [
     "%%writefile vtune_collect.sh\n",
     "#!/bin/bash\n",
-    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu_icc --force \n",
+    "source $ONEAPI_INSTALL/setvars.sh --ccl-configuration=cpu --force \n",
     "type=gpu-hotspots\n",
     "\n",
     "rm -r $(pwd)/vtune_data\n",
@@ -744,7 +744,7 @@
     "export EXAMPLE_ROOT=./lab/\n",
     "mkdir dpcpp\n",
     "cd dpcpp\n",
-    "cmake .. -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=dpcpp\n",
+    "cmake .. -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=dpcpp -DCOMPUTE_BACKEND=dpcpp_level_zero\n",
     "make sycl_allreduce_cpp_test\n"
    ]
   },