From 8e0bdb300d86e7942aa366faacfac70bdfb68c16 Mon Sep 17 00:00:00 2001 From: JoeOster <52936608+JoeOster@users.noreply.github.com> Date: Wed, 29 Sep 2021 09:45:57 -0700 Subject: [PATCH 1/2] 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 --- .../C++/CombinationalLogic/MandelbrotOMP/Makefile | 12 ------------ .../C++/CompilerInfrastructure/Intrinsics/Makefile | 12 ------------ .../Intrinsics/src/intrin_dot_sample.cpp | 12 ------------ .../Intrinsics/src/intrin_double_sample.cpp | 12 ------------ .../Intrinsics/src/intrin_ftz_sample.cpp | 12 ------------ .../C++/GraphTraversal/MergesortOMP/Makefile | 12 ------------ .../GraphTraversal/MergesortOMP/src/merge_sort.cpp | 12 ------------ .../DiscreteCosineTransform/src/DCT.cpp | 13 ------------- .../DiscreteCosineTransform/src/DCT.hpp | 12 ------------ 9 files changed, 109 deletions(-) diff --git a/DirectProgramming/C++/CombinationalLogic/MandelbrotOMP/Makefile b/DirectProgramming/C++/CombinationalLogic/MandelbrotOMP/Makefile index 2e9ce924f3..36798a3914 100644 --- 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 index 70fff7783c..8068092756 100644 --- 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 index f4774140db..fa60747976 100644 --- 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 index 44c1dac23c..7fb803e9fc 100644 --- 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 index d731710d19..773841cd44 100644 --- 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 index 8fc2cbbc18..550db04262 100644 --- 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 index 703942be96..4b43c6b4fc 100644 --- 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 diff --git a/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.cpp b/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.cpp index f48619fd9a..43f34889d4 100644 --- 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 diff --git a/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.hpp b/DirectProgramming/DPC++/SpectralMethods/DiscreteCosineTransform/src/DCT.hpp index 8cf715ec0a..ebaf7a7033 100644 --- 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 From 4bed52e76ceb17243a0bc4ce24e9aed52aaa6e49 Mon Sep 17 00:00:00 2001 From: ericlars Date: Wed, 29 Sep 2021 10:37:09 -0700 Subject: [PATCH 2/2] fix deprecation notice (#682) --- .../oneMKL/black_scholes/black_scholes.cpp | 5 ++-- .../oneMKL/black_scholes/code_wrapper.tpp | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Libraries/oneMKL/black_scholes/code_wrapper.tpp diff --git a/Libraries/oneMKL/black_scholes/black_scholes.cpp b/Libraries/oneMKL/black_scholes/black_scholes.cpp index 7d2180f03b..d7c494945f 100644 --- 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 new file mode 100644 index 0000000000..59fe39c3e5 --- /dev/null +++ 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 + +template +struct has_member_code_meta : std::false_type {}; + +template +struct has_member_code_meta().code() )> > : std::true_type {}; + +template ::value>::type* = nullptr > +auto code_wrapper (T x) { + return x.code(); +}; +template ::value>::type* = nullptr > +auto code_wrapper (T x) { + return x.get_cl_code(); +};