Merge pull request #243 from intel/develop

Develop
intel · Apr 1, 2020 · 0ce00c0 · 0ce00c0
2 parents 61a1b51 + 7cc5a12
commit 0ce00c0
Show file tree

Hide file tree

Showing 120 changed files with 422 additions and 413 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 ##############################################################################
 ## YASK: Yet Another Stencil Kit
-## Copyright (c) 2014-2019, Intel Corporation
+## Copyright (c) 2014-2020, Intel Corporation
 ## 
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to

diff --git a/README.md b/README.md
@@ -34,9 +34,10 @@ YASK contains a domain-specific compiler to convert stencil-equation specificati
        large shared-memory (shm) regions, so those
        versions are not recommended when using the `-use_shm` feature.
        This issue was resolved in MPI version 2019u3.
-     * There is an issue in the Intel C++ compiler 2019.1.x that causes
+     * There is an issue in the Intel C++ compiler 2019.1.0 that causes
        an internal error when building YASK kernels.
-       Use 2019.0.5 to work around until a patch is released.
+       This has been fixed in 19.1.1.
+       You may also use 2019.0.x to work around this.
      * If you are using g++ version 8.x or later, Intel(R) C++ version 2019
        is required.
      * Building a YASK kernel with clang is possible; however,
@@ -77,6 +78,10 @@ YASK contains a domain-specific compiler to convert stencil-equation specificati
 
 ## Backward-compatibility notices
 ### Version 3
+* Version 3.04.00 changed the terms "pack" and "pass" to "stage", which may affect
+  user-written result parsers. Option `auto_tune_each_pass` changed to
+  `auto_tune_each_stage`.
+
 * Version 3.01.00 moved the `-trace` and `-msg_rank` options from the kernel
   library to the kernel utility, so those options may no longer be set via
   `yk_solution::apply_command_line_options()`. APIs to set the corresponding

diff --git a/YASK-LICENSE.md b/YASK-LICENSE.md
@@ -1,5 +1,5 @@
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/docs/YASK-tutorial.pdf b/docs/YASK-tutorial.pdf
diff --git a/docs/api/html/yask__common__api_8hpp_source.html b/docs/api/html/yask__common__api_8hpp_source.html
diff --git a/docs/api/html/yask__compiler__api_8hpp_source.html b/docs/api/html/yask__compiler__api_8hpp_source.html
diff --git a/docs/api/html/yask__kernel__api_8hpp_source.html b/docs/api/html/yask__kernel__api_8hpp_source.html
diff --git a/docs/api/html/yc__node__api_8hpp_source.html b/docs/api/html/yc__node__api_8hpp_source.html
diff --git a/docs/api/html/yc__solution__api_8hpp_source.html b/docs/api/html/yc__solution__api_8hpp_source.html
diff --git a/docs/api/html/yk__solution__api_8hpp_source.html b/docs/api/html/yk__solution__api_8hpp_source.html
diff --git a/docs/api/html/yk__var__api_8hpp_source.html b/docs/api/html/yk__var__api_8hpp_source.html
diff --git a/include/aux/Soln.hpp b/include/aux/Soln.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/include/aux/yc_node_api.hpp b/include/aux/yc_node_api.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/include/aux/yc_solution_api.hpp b/include/aux/yc_solution_api.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/include/aux/yk_solution_api.hpp b/include/aux/yk_solution_api.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/include/aux/yk_var_api.hpp b/include/aux/yk_var_api.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/include/yask_common_api.hpp b/include/yask_common_api.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/include/yask_compiler_api.hpp b/include/yask_compiler_api.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/include/yask_kernel_api.hpp b/include/yask_kernel_api.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/combo.cpp b/src/common/combo.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/combo.hpp b/src/common/combo.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/common.mk b/src/common/common.mk
@@ -1,6 +1,6 @@
 ##############################################################################
 ## YASK: Yet Another Stencil Kit
-## Copyright (c) 2014-2019, Intel Corporation
+## Copyright (c) 2014-2020, Intel Corporation
 ## 
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to

diff --git a/src/common/common_utils.cpp b/src/common/common_utils.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -43,7 +43,7 @@ namespace yask {
     // for numbers above 9 (at least up to 99).
 
     // Format: "major.minor.patch".
-    const string version = "3.03.01";
+    const string version = "3.04.01";
 
     string yask_get_version_string() {
         return version;

diff --git a/src/common/common_utils.hpp b/src/common/common_utils.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -41,6 +41,10 @@ IN THE SOFTWARE.
 // _OPENMP is defined.
 #ifdef _OPENMP
 #include <omp.h>
+#if !defined(KMP_VERSION_MAJOR) || KMP_VERSION_MAJOR >= 5
+// omp_set_nested() is deprecated.
+#define omp_set_nested(n) void(0)
+#endif
 #else
 typedef int omp_lock_t;
 inline int omp_get_num_procs() { return 1; }

diff --git a/src/common/fd_coeff2.cpp b/src/common/fd_coeff2.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/idiv.hpp b/src/common/idiv.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/output.cpp b/src/common/output.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/swig/yask_common_api.i b/src/common/swig/yask_common_api.i
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/tests/tuple_test.cpp b/src/common/tests/tuple_test.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/tuple.cpp b/src/common/tuple.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/tuple.hpp b/src/common/tuple.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/common/yask_assert.hpp b/src/common/yask_assert.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/compiler/Makefile b/src/compiler/Makefile
@@ -1,6 +1,6 @@
 ##############################################################################
 ## YASK: Yet Another Stencil Kit
-## Copyright (c) 2014-2019, Intel Corporation
+## Copyright (c) 2014-2020, Intel Corporation
 ## 
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to

diff --git a/src/compiler/compiler_main.cpp b/src/compiler/compiler_main.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -373,7 +373,7 @@ int main(int argc, const char* argv[]) {
 
     cout << "YASK -- Yet Another Stencil Kit\n"
         "YASK Stencil Compiler Utility\n"
-        "Copyright (c) 2014-2019, Intel Corporation.\n"
+        "Copyright (c) 2014-2020, Intel Corporation.\n"
         "Version: " << yask_get_version_string() << endl;
 
     try {

diff --git a/src/compiler/lib/Cpp.cpp b/src/compiler/lib/Cpp.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/compiler/lib/Cpp.hpp b/src/compiler/lib/Cpp.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -275,7 +275,7 @@ namespace yask {
     // Print out a stencil in C++ form for YASK.
     class YASKCppPrinter : public PrinterBase {
     protected:
-        EqBundlePacks& _eqBundlePacks; // packs of bundles w/o inter-dependencies.
+        EqStages& _eqStages; // stages of bundles w/o inter-dependencies.
         EqBundles& _clusterEqBundles;  // eq-bundles for scalar and vector.
         string _context, _context_base, _context_hook; // class names;
 
@@ -304,10 +304,10 @@ namespace yask {
     public:
         YASKCppPrinter(StencilSolution& stencil,
                        EqBundles& eqBundles,
-                       EqBundlePacks& eqBundlePacks,
+                       EqStages& eqStages,
                        EqBundles& clusterEqBundles) :
             PrinterBase(stencil, eqBundles),
-            _eqBundlePacks(eqBundlePacks),
+            _eqStages(eqStages),
             _clusterEqBundles(clusterEqBundles)
         {
             // name of C++ struct.

diff --git a/src/compiler/lib/CppIntrin.cpp b/src/compiler/lib/CppIntrin.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/src/compiler/lib/CppIntrin.hpp b/src/compiler/lib/CppIntrin.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 YASK: Yet Another Stencil Kit
-Copyright (c) 2014-2019, Intel Corporation
+Copyright (c) 2014-2020, Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -212,9 +212,9 @@ namespace yask {
     public:
         YASKKncPrinter(StencilSolution& stencil,
                        EqBundles& eqBundles,
-                       EqBundlePacks& eqBundlePacks,
+                       EqStages& eqStages,
                        EqBundles& clusterEqBundles) :
-            YASKCppPrinter(stencil, eqBundles, eqBundlePacks, clusterEqBundles) { }
+            YASKCppPrinter(stencil, eqBundles, eqStages, clusterEqBundles) { }
 
         virtual int num_vec_elems() const { return 64 / _settings._elem_bytes; }
 
@@ -234,9 +234,9 @@ namespace yask {
     public:
         YASKAvx256Printer(StencilSolution& stencil,
                           EqBundles& eqBundles,
-                          EqBundlePacks& eqBundlePacks,
+                          EqStages& eqStages,
                           EqBundles& clusterEqBundles) :
-            YASKCppPrinter(stencil, eqBundles, eqBundlePacks, clusterEqBundles) { }
+            YASKCppPrinter(stencil, eqBundles, eqStages, clusterEqBundles) { }
 
         virtual int num_vec_elems() const { return 32 / _settings._elem_bytes; }
     };
@@ -254,10 +254,10 @@ namespace yask {
     public:
         YASKAvx512Printer(StencilSolution& stencil,
                           EqBundles& eqBundles,
-                          EqBundlePacks& eqBundlePacks,
+                          EqStages& eqStages,
                           EqBundles& clusterEqBundles,
                           bool is_lo = false) :
-            YASKCppPrinter(stencil, eqBundles, eqBundlePacks, clusterEqBundles),
+            YASKCppPrinter(stencil, eqBundles, eqStages, clusterEqBundles),
             _is_lo(is_lo) { }
 
         virtual int num_vec_elems() const {