updated oneDPL jupyter notebooks (#1216)

* updated with the latest 2023 changes

* Updated the notebooks with oneDPL changes

* updated onedpl notebooks for latest changes

* updated onedpl notebooks for latest changes

Author: praveenkk123

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/02_DPCPP_Program_Structure/DPCPP_Program_Structure.ipynb

@@ -611,10 +611,10 @@
     "#include <sycl/sycl.hpp>\n",
     "#include <iostream>\n",
     "using namespace sycl;\n",
-    "class my_device_selector : public device_selector {\n",
+    "class my_device_selector {\n",
     "public:\n",
     "    my_device_selector(std::string vendorName) : vendorName_(vendorName){};\n",
-    "    int operator()(const device& dev) const override {\n",
+    "    int operator()(const device& dev) const {\n",
     "    int rating = 0;\n",
     "    //We are querying for the custom device specific to a Vendor and if it is a GPU device we\n",
     "    //are giving the highest rating as 3 . The second preference is given to any GPU device and the third preference is given to\n",
@@ -705,7 +705,7 @@
     "// Number of complex numbers passing to the SYCL code\n",
     "static const int num_elements = 10000;\n",
     "\n",
-    "class CustomDeviceSelector : public device_selector {\n",
+    "class CustomDeviceSelector {\n",
     " public:\n",
     "  CustomDeviceSelector(std::string vendorName) : vendorName_(vendorName){};\n",
     "  int operator()(const device &dev) const override {\n",
@@ -1007,9 +1007,9 @@
    ]
   }
  ],
-  "metadata": {
+ "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.7 (Intel® oneAPI)",
+   "display_name": "Python 3 (Intel® oneAPI 2022.3)",
    "language": "python",
    "name": "c009-intel_distribution_of_python_3_oneapi-beta05-python"
   },
@@ -1023,7 +1023,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.7"
+   "version": "3.9.13"
   },
   "toc": {
    "base_numbering": 1,

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/02_DPCPP_Program_Structure/lab/complex_mult.cpp

@@ -17,7 +17,7 @@ using namespace std;
 // Number of complex numbers passing to the SYCL code
 static const int num_elements = 10000;
 
-class CustomDeviceSelector : public device_selector {
+class CustomDeviceSelector {
  public:
   CustomDeviceSelector(std::string vendorName) : vendorName_(vendorName){};
   int operator()(const device &dev) const override {

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/02_DPCPP_Program_Structure/src/complex_mult.cpp

@@ -17,22 +17,21 @@ using namespace std;
 // Number of complex numbers passing to the SYCL code
 static const int num_elements = 10000;
 
-class CustomDeviceSelector : public device_selector {
+class CustomDeviceSelector {
  public:
   CustomDeviceSelector(std::string vendorName) : vendorName_(vendorName){};
   int operator()(const device &dev) const override {
     int device_rating = 0;
     //We are querying for the custom device specific to a Vendor and if it is a GPU device we
     //are giving the highest rating as 3 . The second preference is given to any GPU device and the third preference is given to
     //CPU device. 
-    //**************Step1: Uncomment the following lines where you are setting the rating for the devices********
-    /*if (dev.is_gpu() & (dev.get_info<info::device::name>().find(vendorName_) !=
+    if (dev.is_gpu() & (dev.get_info<info::device::name>().find(vendorName_) !=
                         std::string::npos))
       device_rating = 3;
     else if (dev.is_gpu())
       device_rating = 2;
     else if (dev.is_cpu())
-      device_rating = 1;*/
+      device_rating = 1;
     return device_rating;
   };
 
@@ -65,12 +64,9 @@ void SYCLParallel(queue &q, std::vector<Complex2> &in_vect1,
     accessor V1(bufin_vect1,h,read_only);
     accessor V2(bufin_vect2,h,read_only);
     // Accessor set to Write mode
-    //**************STEP 2: Uncomment the below line to set the Write Accessor******************** 
-    //accessor V3 (bufout_vect,h,write_only);
+    accessor V3 (bufout_vect,h,write_only);
     h.parallel_for(R, [=](auto i) {
-      //**************STEP 3: Uncomment the below line to call the complex_mul function that computes the multiplication
-      //of the  complex numbers********************
-      //V3[i] = V1[i].complex_mul(V2[i]);
+      V3[i] = V1[i].complex_mul(V2[i]);
     });
   });
   q.wait_and_throw();

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/02_DPCPP_Program_Structure/src/custom_device_sample.cpp

@@ -6,10 +6,10 @@
 #include <sycl/sycl.hpp>
 #include <iostream>
 using namespace sycl;
-class my_device_selector : public device_selector {
+class my_device_selector {
 public:
     my_device_selector(std::string vendorName) : vendorName_(vendorName){};
-    int operator()(const device& dev) const override {
+    int operator()(const device& dev) const {
     int rating = 0;
     //We are querying for the custom device specific to a Vendor and if it is a GPU device we
     //are giving the highest rating as 3 . The second preference is given to any GPU device and the third preference is given to

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/07_DPCPP_Library/lab/binary_search.cpp

@@ -8,7 +8,7 @@
 #include <oneapi/dpl/execution>
 #include <oneapi/dpl/iterator>
 #include <iostream>
-#include <sycl/sycl.hpp>
+
 
 using namespace sycl;
 using namespace oneapi::dpl::execution;
@@ -50,7 +50,7 @@ int main() {
 
     //function object to be passed to sort function  
 
-    //Calling the dpstd binary search algorithm. We pass in the policy, the buffer iterators for the input vectors and the output. 
+    //Calling the onedpl binary search algorithm. We pass in the policy, the buffer iterators for the input vectors and the output. 
     // Default comparator is the operator < used here. 
     const auto i =  oneapi::dpl::binary_search(policy,keys_begin,keys_end,vals_begin,vals_end,result_begin);
 

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/07_DPCPP_Library/lab/counting_iterator.cpp

@@ -17,7 +17,7 @@ int main() {
     oneapi::dpl::counting_iterator<int> count_b = count_a + 100;
     int init = count_a[0]; // OK: init == 0
     //*count_b = 7; // ERROR: counting_iterator doesn't provide write operations
-    auto sum = std::reduce(dpl::execution::dpcpp_default,
+    auto sum = oneapi::dpl::reduce(dpl::execution::dpcpp_default,
      count_a, count_b, init); // sum is (0 + 0 + 1 + ... + 99) = 4950
     std::cout << "The Sum is: " <<sum<<"\n";
 

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/07_DPCPP_Library/lab/discard_iterator.cpp

@@ -11,7 +11,7 @@
 #include <iostream>
 
 #include <tuple>
-#include <sycl/sycl.hpp>
+
 
 using namespace sycl;
 using namespace oneapi::dpl::execution;
@@ -46,7 +46,7 @@ int main() {
 
     auto zipped_first = oneapi::dpl::make_zip_iterator(keys_begin, vals_begin);
 
-    auto iter_res = std::copy_if(dpl::execution::dpcpp_default,zipped_first, zipped_first + num_elements,
+    auto iter_res = oneapi::dpl::copy_if(dpl::execution::dpcpp_default,zipped_first, zipped_first + num_elements,
                  dpl::make_zip_iterator(result_begin, dpl::discard_iterator()),
                  [](auto t){return get<1>(t) == 1;});    
 

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/07_DPCPP_Library/lab/dpl_buffer.cpp

@@ -7,7 +7,7 @@
 #include <oneapi/dpl/algorithm>
 #include <oneapi/dpl/execution>
 #include <oneapi/dpl/iterator>
-#include <sycl/sycl.hpp>
+
 using namespace sycl;
 using namespace oneapi::dpl::execution;
 
@@ -23,8 +23,8 @@ int main(){
     auto buf_begin = oneapi::dpl::begin(buf);
     auto buf_end   = oneapi::dpl::end(buf);
 
-    std::for_each(make_device_policy(q), buf_begin, buf_end, [](int &a){ a *= 3; });
-    std::sort(make_device_policy(q), buf_begin, buf_end);
+    oneapi::dpl::for_each(make_device_policy(q), buf_begin, buf_end, [](int &a){ a *= 3; });
+    oneapi::dpl::sort(make_device_policy(q), buf_begin, buf_end);
   }
 
   for(int i = 0; i < v.size(); i++) std::cout << v[i] << "\n";

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/07_DPCPP_Library/lab/dpl_simple.cpp

@@ -6,7 +6,7 @@
 
 #include <oneapi/dpl/algorithm>
 #include <oneapi/dpl/execution>
-#include<sycl/sycl.hpp>
+
 using namespace sycl;
 constexpr int N = 4;
 
@@ -16,7 +16,7 @@ int main() {
   std::vector<int> v(N);
 
   //# Parallel STL fill function with device policy
-  std::fill(oneapi::dpl::execution::make_device_policy(q), v.begin(), v.end(), 20);
+  oneapi::dpl::fill(oneapi::dpl::execution::make_device_policy(q), v.begin(), v.end(), 20);
 
   for(int i = 0; i < v.size(); i++) std::cout << v[i] << "\n";
   return 0;

DirectProgramming/DPC++/Jupyter/oneapi-essentials-training/07_DPCPP_Library/lab/dpl_sortdouble.cpp

@@ -6,7 +6,7 @@
 
 #include <oneapi/dpl/algorithm>
 #include <oneapi/dpl/execution>
-#include<sycl/sycl.hpp>
+
 using namespace sycl;
 using namespace oneapi::dpl::execution;
 
@@ -15,8 +15,8 @@ int main() {
   std::cout << "Device : " << q.get_device().get_info<info::device::name>() << "\n";
   std::vector<int> v{2,3,1,4};
 
-  std::for_each(make_device_policy(q), v.begin(), v.end(), [](int &a){ a *= 2; });
-  std::sort(make_device_policy(q), v.begin(), v.end());
+  oneapi::dpl::for_each(make_device_policy(q), v.begin(), v.end(), [](int &a){ a *= 2; });
+  oneapi::dpl::sort(make_device_policy(q), v.begin(), v.end());
 
   for(int i = 0; i < v.size(); i++) std::cout << v[i] << "\n";
   return 0;