Pul late changes from 2021.4 into Development branch (#686)

JoeOster · ericlars · web-flow · commit 7145f41781ca · 2021-09-29T13:53:29.000-07:00
* ONSAM-1414 Broken Link in Headers (#685) * Update Makefile * Update Makefile * Update Makefile * Update DCT.hpp * Update intrin_ftz_sample.cpp * Update merge_sort.cpp * Update intrin_double_sample.cpp * Update intrin_dot_sample.cpp * Update DCT.cpp * fix deprecation notice (#682) Co-authored-by: ericlars <eric.larson@intel.com>
diff --git a/DirectProgramming/C++/CombinationalLogic/MandelbrotOMP/Makefile b/DirectProgramming/C++/CombinationalLogic/MandelbrotOMP/Makefile
@@ -1,15 +1,3 @@
-#==============================================================
-#
-# SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-# http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-#
-# Copyright Intel Corporation
-#
-# THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT
-# NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-#
-# =============================================================
 CXX := icpc
 SRCDIR := src
 BUILDDIR := release
diff --git a/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/Makefile b/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/Makefile
@@ -1,15 +1,3 @@
-#==============================================================
-#
-# SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-# http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-#
-# Copyright Intel Corporation
-#
-# THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT
-# NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-#
-# =============================================================
 CC = icc
 EXECS=intrin_dot_sample.exe intrin_double_sample.exe intrin_ftz_sample.exe
 DBG_EXECS=intrin_dot_sample_dbg.exe intrin_double_sample_dbg.exe intrin_ftz_sample_dbg.exe
diff --git a/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/src/intrin_dot_sample.cpp b/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/src/intrin_dot_sample.cpp
@@ -1,15 +1,3 @@
-//==============================================================
-//
-// SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-// http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-//
-// Copyright 2016 Intel Corporation
-//
-// THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-//
-// =============================================================
 /* [DESCRIPTION]
  * This C code sample demonstrates how to use C, Intel(R) MMX(TM),
  * Intel(R) Streaming SIMD Extensions 3 (Intel(R) SSE3),
diff --git a/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/src/intrin_double_sample.cpp b/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/src/intrin_double_sample.cpp
@@ -1,15 +1,3 @@
-//==============================================================
-//
-// SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-// http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-//
-// Copyright 2016 Intel Corporation
-//
-// THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-//
-// =============================================================
 /* [DESCRIPTION]
  * This C code sample demonstrates how to use C in
  * comparison with
diff --git a/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/src/intrin_ftz_sample.cpp b/DirectProgramming/C++/CompilerInfrastructure/Intrinsics/src/intrin_ftz_sample.cpp
@@ -1,15 +1,3 @@
-//==============================================================
-//
-// SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-// http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-//
-// Copyright 2017 Intel Corporation
-//
-// THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-//
-// =============================================================
 /* [DESCRIPTION]
  * This code sample demonstrates how to use the
  * _MM_GET_FLUSH_ZERO_MODE() and _MM_GET_DENORMALS_ZERO_MODE()
diff --git a/DirectProgramming/C++/GraphTraversal/MergesortOMP/Makefile b/DirectProgramming/C++/GraphTraversal/MergesortOMP/Makefile
@@ -1,15 +1,3 @@
-#==============================================================
-#
-# SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-# http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-#
-# Copyright Intel Corporation
-#
-# THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT
-# NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-#
-# =============================================================
 CXX := icpc
 SRCDIR := src
 BUILDDIR := release
diff --git a/DirectProgramming/C++/GraphTraversal/MergesortOMP/src/merge_sort.cpp b/DirectProgramming/C++/GraphTraversal/MergesortOMP/src/merge_sort.cpp
@@ -1,15 +1,3 @@
-//==============================================================
-//
-// SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-// http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-//
-// Copyright Intel Corporation
-//
-// THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-//
-// =============================================================
 #define _CRT_SECURE_NO_DEPRECATE
 #include <omp.h>
 
diff --git a/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.cpp b/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.cpp
@@ -1,16 +1,3 @@
-//=======================================================================================
-//
-// SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-// http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-//
-// Copyright Intel Corporation
-//
-// THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-//
-// ======================================================================================
-
 #include "DCT.hpp"
 
 #include <CL/sycl.hpp>
diff --git a/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.hpp b/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.hpp
@@ -1,15 +1,3 @@
-//=======================================================================================
-//
-// SAMPLE SOURCE CODE - SUBJECT TO THE TERMS OF SAMPLE CODE LICENSE AGREEMENT,
-// http://software.intel.com/en-us/articles/intel-sample-source-code-license-agreement/
-//
-// Copyright Intel Corporation
-//
-// THIS FILE IS PROVIDED "AS IS" WITH NO WARRANTIES, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-//
-// ======================================================================================
 #pragma pack(push, 1)
 
 // This is the data structure which is going to represent one pixel value in RGB
diff --git a/Libraries/oneMKL/black_scholes/black_scholes.cpp b/Libraries/oneMKL/black_scholes/black_scholes.cpp
@@ -27,6 +27,7 @@ using namespace oneapi;
 
 #include "input_generator.hpp"
 #include "black_scholes.hpp"
+#include "code_wrapper.tpp"
 
 namespace {
 
@@ -83,7 +84,7 @@ void async_sycl_error(sycl::exception_list el) {
         try {
             std::rethrow_exception(*l);
         } catch(const sycl::exception & e) {
-            std::cerr << "SYCL exception occured with code " << e.get_cl_code() << " with " << e.what() << std::endl;
+            std::cerr << "SYCL exception occured with code " << code_wrapper(e) << " with " << e.what() << std::endl;
         }
     }
 }
@@ -184,7 +185,7 @@ int sample_run(int64_t nopt) {
         }
     }
     catch (sycl::exception const & re) {
-        std::cerr << "SYCL exception occured with code " << re.get_cl_code() << " with " << re.what() << std::endl;
+        std::cerr << "SYCL exception occured with code " << code_wrapper(re) << " with " << re.what() << std::endl;
         return -1;
     }
 
diff --git a/Libraries/oneMKL/black_scholes/code_wrapper.tpp b/Libraries/oneMKL/black_scholes/code_wrapper.tpp
@@ -0,0 +1,28 @@
+//==============================================================
+// Copyright © 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+// =============================================================
+
+/*******************************************************************************
+  !  Content:
+  !      Wrapper utility for backward compatibility with get_cl_code in SYCL 1.2.1
+  !******************************************************************************/
+
+#pragma once
+#include <utility>
+
+template <typename T, typename = void>
+struct has_member_code_meta : std::false_type {};
+
+template <typename T>
+struct has_member_code_meta<T, std::void_t<decltype( std::declval<T>().code() )> > : std::true_type {};
+
+template <typename T, typename std::enable_if<has_member_code_meta<T>::value>::type* = nullptr >
+auto code_wrapper (T x) {
+    return x.code();
+};
+template <typename T, typename std::enable_if<!has_member_code_meta<T>::value>::type* = nullptr >
+auto code_wrapper (T x) {
+    return x.get_cl_code();
+};

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ using namespace oneapi;`
`27`	`27`
`28`	`28`	`#include "input_generator.hpp"`
`29`	`29`	`#include "black_scholes.hpp"`
	`30`	`+#include "code_wrapper.tpp"`
`30`	`31`
`31`	`32`	`namespace {`
`32`	`33`
`@@ -83,7 +84,7 @@ void async_sycl_error(sycl::exception_list el) {`
`83`	`84`	`try {`
`84`	`85`	`std::rethrow_exception(*l);`
`85`	`86`	`} catch(const sycl::exception & e) {`
`86`		`- std::cerr << "SYCL exception occured with code " << e.get_cl_code() << " with " << e.what() << std::endl;`
	`87`	`+ std::cerr << "SYCL exception occured with code " << code_wrapper(e) << " with " << e.what() << std::endl;`
`87`	`88`	`}`
`88`	`89`	`}`
`89`	`90`	`}`
`@@ -184,7 +185,7 @@ int sample_run(int64_t nopt) {`
`184`	`185`	`}`
`185`	`186`	`}`
`186`	`187`	`catch (sycl::exception const & re) {`
`187`		`- std::cerr << "SYCL exception occured with code " << re.get_cl_code() << " with " << re.what() << std::endl;`
	`188`	`+ std::cerr << "SYCL exception occured with code " << code_wrapper(re) << " with " << re.what() << std::endl;`
`188`	`189`	`return -1;`
`189`	`190`	`}`
`190`	`191`