Sync concurrency examples with development

.github/workflows/build.yml

@@ -55,7 +55,9 @@ jobs:
             CC: icx
             CXX: icpx
             CXXFLAGS: -Wno-uninitialized
+            FC: ifx
             OCCA_COVERAGE: 0
+            OCCA_FORTRAN_ENABLED: 1
             useCMake: true
             useoneAPI: true
 
@@ -113,9 +115,9 @@ jobs:
         -DCMAKE_C_COMPILER=${CC} \
         -DCMAKE_CXX_COMPILER=${CXX} \
         -DCMAKE_Fortran_COMPILER=${FC} \
-        -DENABLE_TESTS=ON \
-        -DENABLE_EXAMPLES=ON \
-        -DENABLE_FORTRAN=ON
+        -DOCCA_ENABLE_TESTS=ON \
+        -DOCCA_ENABLE_EXAMPLES=ON \
+        -DOCCA_ENABLE_FORTRAN=${OCCA_FORTRAN_ENABLED}
 
     - name: CMake configure
       if: ${{ matrix.useCMake && matrix.useoneAPI}}
@@ -129,9 +131,10 @@ jobs:
         -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_C_COMPILER=${CC} \
         -DCMAKE_CXX_COMPILER=${CXX} \
-        -DENABLE_TESTS=ON \
-        -DENABLE_EXAMPLES=ON \
-        -DCMAKE_PREFIX_PATH="/opt/intel/oneapi/compiler/latest/linux;/opt/intel/oneapi/compiler/latest/linux/compiler"
+        -DCMAKE_Fortran_COMPILER=${FC} \
+        -DOCCA_ENABLE_TESTS=ON \
+        -DOCCA_ENABLE_EXAMPLES=ON \
+        -DOCCA_ENABLE_FORTRAN=${OCCA_FORTRAN_ENABLED}
 
     - name: CMake build
       if: ${{ matrix.useCMake && !matrix.useoneAPI}}
@@ -166,7 +169,7 @@ jobs:
     - name: Run CTests
       if: ${{ matrix.useCMake && !matrix.useoneAPI }}
       run: |
-        ctest --test-dir build --progress --output-on-failure --parallel 8 --schedule-random -E "examples_cpp_arrays-opencl|examples_cpp_for_loops-opencl|examples_cpp_generic_inline_kernel-opencl|examples_cpp_shared_memory-opencl|examples_cpp_nonblocking_streams-opencl|examples_cpp_for_loops-dpcpp|examples_cpp_arrays-dpcpp|examples_cpp_nonblocking_streams-dpcpp"
+        ctest --test-dir build --progress --output-on-failure --parallel 8 --schedule-random -E "examples_cpp_arrays-opencl|examples_cpp_for_loops-opencl|examples_cpp_generic_inline_kernel-opencl|examples_cpp_shared_memory-opencl|examples_cpp_nonblocking_streams-opencl|examples_cpp_for_loops-dpcpp|examples_cpp_arrays-dpcpp|examples_cpp_generic_inline_kernel-dpcpp|examples_cpp_nonblocking_streams-dpcpp"
 
 
 
@@ -178,8 +181,8 @@ jobs:
         OCCA_DPCPP_COMPILER: icpx
       run: |
         source /opt/intel/oneapi/setvars.sh
-        export SYCL_DEVICE_FILTER=opencl.cpu
-        ctest --test-dir build --progress --output-on-failure --parallel 8 --schedule-random -E "examples_cpp_arrays-opencl|examples_cpp_for_loops-opencl|examples_cpp_generic_inline_kernel-opencl|examples_cpp_shared_memory-opencl|examples_cpp_nonblocking_streams-opencl|examples_cpp_for_loops-dpcpp|examples_cpp_arrays-dpcpp|examples_cpp_nonblocking_streams-dpcpp"
+        export ONEAPI_DEVICE_SELECTOR=*:cpu
+        ctest --test-dir build --progress --output-on-failure --parallel 8 --schedule-random -E "opencl-*|dpcpp-*"
 
     - name: Upload code coverage
       if: ${{ matrix.OCCA_COVERAGE }}

.gitignore

@@ -21,6 +21,10 @@ opt
 /.compiledDefines
 /include/occa/defines/compiledDefines.hpp
 /include/occa/scripts
+/include/occa/core/kernelOperators.hpp_codegen
+/src/core/kernelOperators.cpp_codegen
+/src/occa/internal/utils/runFunction.cpp_codegen
+/include/occa/defines/macros.hpp_codegen
 
 # Binaries generated to fetch compiler information
 /scripts/compiler/compilerSupportsMPI

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.17 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.21 FATAL_ERROR)
 
 #---[ CMake Config ]--------------------
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -11,7 +11,7 @@ cmake_policy(SET CMP0056 NEW)
 
 #---[ Build Config ]--------------------
 project(OCCA
-  VERSION 1.6.0
+  VERSION 2.0.0
   DESCRIPTION  "JIT Compilation for Multiple Architectures: C++, OpenMP, CUDA, HIP, OpenCL, Metal"
   HOMEPAGE_URL "https://github.com/libocca/occa"
   LANGUAGES    C CXX)
@@ -27,32 +27,34 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-option(ENABLE_OPENMP "Build with OpenMP if available" ON)
-option(ENABLE_CUDA   "Build with CUDA if available"   ON)
-option(ENABLE_OPENCL "Build with OpenCL if available" ON)
-option(ENABLE_HIP    "Build with HIP if available" ON)
-option(ENABLE_METAL  "Build with Metal if available" ON)
-option(ENABLE_DPCPP "Build with SYCL/DPCPP if available" ON)
+option(OCCA_ENABLE_OPENMP "Build with OpenMP if available" ON)
+option(OCCA_ENABLE_CUDA   "Build with CUDA if available"   ON)
+option(OCCA_ENABLE_OPENCL "Build with OpenCL if available" ON)
+option(OCCA_ENABLE_HIP    "Build with HIP if available" ON)
+option(OCCA_ENABLE_METAL  "Build with Metal if available" ON)
+option(OCCA_ENABLE_DPCPP "Build with SYCL/DPCPP if available" ON)
 
-option(ENABLE_TESTS    "Build tests"               OFF)
-option(ENABLE_EXAMPLES "Build simple examples"     OFF)
-option(ENABLE_FORTRAN  "Enable Fortran interface"  OFF)
+option(OCCA_ENABLE_TESTS    "Build tests"               OFF)
+option(OCCA_ENABLE_EXAMPLES "Build simple examples"     OFF)
+option(OCCA_ENABLE_FORTRAN  "Enable Fortran interface"  OFF)
 
-if(ENABLE_FORTRAN)
+if(OCCA_ENABLE_FORTRAN)
   enable_language(Fortran)
 endif()
 
 option(ENABLE_SHARABLE_DEVICE  "Enable sharable device by multiple threads"  OFF)
 if (ENABLE_SHARABLE_DEVICE)
-  add_compile_definitions(OCCA_THREAD_SHARABLE_ENABLED=1)
+  set(OCCA_THREAD_SHARABLE_ENABLED 1)
   message("-- OCCA sharable by multi-threads     : Enabled")
 else()
-  add_compile_definitions(OCCA_THREAD_SHARABLE_ENABLED=0)
+  set(OCCA_THREAD_SHARABLE_ENABLED 0)
 endif()
 
 set(OCCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(OCCA_BUILD_DIR  ${CMAKE_BINARY_DIR})
 
+include(CodeGen)
+
 set(OCCA_USING_VS OFF)
 set(OCCA_UNSAFE   OFF)
 
@@ -78,11 +80,11 @@ message("-- System     : ${CMAKE_SYSTEM}")
 message("-- Build type : ${CMAKE_BUILD_TYPE}")
 message("-- C flags    : ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}")
 message("-- CXX flags  : ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}")
-if(ENABLE_FORTRAN)
+if(OCCA_ENABLE_FORTRAN)
   message("-- F90 flags  : ${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}")
 endif()
 
-if(ENABLE_FORTRAN)
+if(OCCA_ENABLE_FORTRAN)
   set(CMAKE_Fortran_MODULE_DIRECTORY ${OCCA_BUILD_DIR}/mod)
 endif()
 #=======================================
@@ -114,7 +116,7 @@ target_compile_definitions(libocca PRIVATE -DUSE_CMAKE)
 #=======================================
 
 #---[ OpenMP ]--------------------------
-if(ENABLE_OPENMP)
+if(OCCA_ENABLE_OPENMP)
   find_package(OpenMP)
 
   if(OPENMP_CXX_FOUND)
@@ -126,14 +128,14 @@ if(ENABLE_OPENMP)
     # Use the provided imported target OpenMP::OpenMP_CXX,
     # (which wraps the CXX_INCLUDE_DIRS and CXX_LIBRARIES,) to make our package relocatable
     target_link_libraries(libocca PRIVATE OpenMP::OpenMP_CXX)
-  else(OPENMP_CXX_FOUND)
+  else()
     set(OCCA_OPENMP_ENABLED 0)
-  endif(OPENMP_CXX_FOUND)
-endif(ENABLE_OPENMP)
+  endif()
+endif()
 #=======================================
 
 #---[ CUDA ]----------------------------
-if(ENABLE_CUDA)
+if(OCCA_ENABLE_CUDA)
   find_package(CUDAToolkit)
 
   if(CUDAToolkit_FOUND)
@@ -144,15 +146,14 @@ if(ENABLE_CUDA)
 
     # Use the provided imported target CUDA::cuda_driver, to make our package relocatable
     target_link_libraries(libocca PRIVATE CUDA::cuda_driver)
-
-  else (CUDAToolkit_FOUND)
+  else()
     set(OCCA_CUDA_ENABLED 0)
-  endif(CUDAToolkit_FOUND)
-endif(ENABLE_CUDA)
+  endif()
+endif()
 #=======================================
 
 #---[ OpenCL ]--------------------------
-if(ENABLE_OPENCL)
+if(OCCA_ENABLE_OPENCL)
   find_package(OpenCLWrapper)
 
   if(OpenCL_FOUND)
@@ -164,14 +165,14 @@ if(ENABLE_OPENCL)
     # Use the provided imported target OpenCL::OpenCL,
     # (which wraps the _INCLUDE_DIRS and _LIBRARIES,) to make our package relocatable
     target_link_libraries(libocca PRIVATE OpenCL::OpenCL)
-  else (OpenCL_FOUND)
+  else()
     set(OCCA_OPENCL_ENABLED 0)
-  endif(OpenCL_FOUND)
-endif(ENABLE_OPENCL)
+  endif()
+endif()
 #=======================================
 
 #---[ SYCL/DPCPP ]-----------------------
-if(ENABLE_DPCPP)
+if(OCCA_ENABLE_DPCPP)
   find_package(DPCPP)
 
   if(DPCPP_FOUND)
@@ -187,11 +188,11 @@ if(ENABLE_DPCPP)
   else()
     set(OCCA_DPCPP_ENABLED 0)
   endif()
-endif(ENABLE_DPCPP)
+endif()
 #=======================================
 
 #---[ HIP ]-----------------------------
-if(ENABLE_HIP)
+if(OCCA_ENABLE_HIP)
   find_package(HIP)
 
   if(HIP_FOUND)
@@ -208,11 +209,11 @@ if(ENABLE_HIP)
   else (HIP_FOUND)
     set(OCCA_HIP_ENABLED 0)
   endif(HIP_FOUND)
-endif(ENABLE_HIP)
+endif()
 #=======================================
 
 #---[ Metal ]---------------------------
-if(ENABLE_METAL AND APPLE)
+if(OCCA_ENABLE_METAL AND APPLE)
   find_package(METAL)
 
   if(METAL_FOUND)
@@ -230,6 +231,16 @@ if(ENABLE_METAL AND APPLE)
   endif()
 endif()
 #=======================================
+
+if(NOT OCCA_IS_TOP_LEVEL)
+# OCCA is being built as a subdirectory in another project
+  set(OCCA_OPENMP_ENABLED ${OCCA_OPENMP_ENABLED} PARENT_SCOPE)
+  set(OCCA_CUDA_ENABLED ${OCCA_CUDA_ENABLED} PARENT_SCOPE)
+  set(OCCA_HIP_ENABLED ${OCCA_HIP_ENABLED} PARENT_SCOPE)
+  set(OCCA_DPCPP_ENABLED ${OCCA_DPCPP_ENABLED} PARENT_SCOPE)
+  set(OCCA_OPENCL_ENABLED ${OCCA_OPENCL_ENABLED} PARENT_SCOPE)
+  set(OCCA_METAL_ENABLED ${OCCA_METAL_ENABLED} PARENT_SCOPE)
+endif()
 
 # Generate CompiledDefines from libraries we found
 configure_file(
@@ -245,7 +256,7 @@ file(
   GLOB_RECURSE OCCA_SRC_cpp
   RELATIVE ${OCCA_SOURCE_DIR} "src/*.cpp")
 
-if(ENABLE_FORTRAN)
+if(OCCA_ENABLE_FORTRAN)
   file(GLOB_RECURSE OCCA_SRC_f90
     RELATIVE ${OCCA_SOURCE_DIR} "src/*.f90")
 
@@ -275,14 +286,14 @@ target_sources(libocca PRIVATE ${OCCA_SRC})
 install(TARGETS libocca EXPORT occaExport DESTINATION lib)
 install(DIRECTORY include/ DESTINATION include)
 
-if(ENABLE_TESTS)
+if(OCCA_ENABLE_TESTS)
   include(CTest)
   add_subdirectory(tests)
-endif(ENABLE_TESTS)
+endif()
 
-if(ENABLE_EXAMPLES)
+if(OCCA_ENABLE_EXAMPLES)
   add_subdirectory(examples)
-endif(ENABLE_EXAMPLES)
+endif()
 
 add_subdirectory(bin)
 

INSTALL.md

@@ -4,7 +4,7 @@
 
 ### Minimum
 
-- [CMake] v3.17 or newer
+- [CMake] v3.21 or newer
 - C++17 compiler
 - C11 compiler
 
@@ -25,7 +25,7 @@ OCCA uses the [CMake] build system. For convenience, the shell script `configure
 
 Example
 ```shell
-$ CC=clang CXX=clang++ ENABLE_OPENMP="OFF" ./configure-cmake.sh
+$ CC=clang CXX=clang++ OCCA_ENABLE_OPENMP="OFF" ./configure-cmake.sh
 ``` 
 
 | Build Parameter | Description | Default |
@@ -37,15 +37,15 @@ $ CC=clang CXX=clang++ ENABLE_OPENMP="OFF" ./configure-cmake.sh
 | CXXFLAGS | C++ compiler flags | *empty* | 
 | CC | C11 compiler| `gcc` |
 | CFLAGS | C compiler flags | *empty* |
-| ENABLE_CUDA | Enable use of the CUDA backend | `ON`|
-| ENABLE_HIP | Enable use of the HIP backend | `ON`|
-| ENABLE_DPCPP | Enable use of the DPC++ backend | `ON`|
-| ENABLE_OPENCL | Enable use of the OpenCL backend | `ON`|
-| ENABLE_OPENMP | Enable use of the OpenMP backend | `ON`|
-| ENABLE_METAL | Enable use of the Metal backend | `ON`|
-| ENABLE_TESTS | Build OCCA's test harness | `ON` |
-| ENABLE_EXAMPLES | Build OCCA examples | `ON` |
-| ENABLE_FORTRAN | Build the Fortran language bindings | `OFF`|
+| OCCA_ENABLE_CUDA | Enable use of the CUDA backend | `ON`|
+| OCCA_ENABLE_HIP | Enable use of the HIP backend | `ON`|
+| OCCA_ENABLE_DPCPP | Enable use of the DPC++ backend | `ON`|
+| OCCA_ENABLE_OPENCL | Enable use of the OpenCL backend | `ON`|
+| OCCA_ENABLE_OPENMP | Enable use of the OpenMP backend | `ON`|
+| OCCA_ENABLE_METAL | Enable use of the Metal backend | `ON`|
+| OCCA_ENABLE_TESTS | Build OCCA's test harness | `ON` |
+| OCCA_ENABLE_EXAMPLES | Build OCCA examples | `ON` |
+| OCCA_ENABLE_FORTRAN | Build the Fortran language bindings | `OFF`|
 | FC | Fortran 90 compiler | `gfortran` |
 | FFLAGS | Fortran compiler flags | *empty* |
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2023 David Medina and Tim Warburton
+Copyright (c) 2014-2024 David Medina and Tim Warburton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -80,6 +80,14 @@ else
 endif
 #=================================================
 
+PLACE_GENERATED_CODES := $(shell mkdir -p $(OCCA_DIR)/include/occa/core/codegen | \
+                                 mkdir -p $(OCCA_DIR)/src/core/codegen | \
+                                 mkdir -p $(OCCA_DIR)/src/occa/internal/utils/codegen | \
+                                 mkdir -p $(OCCA_DIR)/include/occa/defines/codegen)
+PLACE_GENERATED_CODES := $(shell cp $(OCCA_DIR)/scripts/codegen/kernelOperators.hpp_codegen.in $(OCCA_DIR)/include/occa/core/codegen/kernelOperators.hpp_codegen | \
+                                 cp $(OCCA_DIR)/scripts/codegen/kernelOperators.cpp_codegen.in $(OCCA_DIR)/src/core/codegen/kernelOperators.cpp_codegen | \
+                                 cp $(OCCA_DIR)/scripts/codegen/runFunction.cpp_codegen.in $(OCCA_DIR)/src/occa/internal/utils/codegen/runFunction.cpp_codegen | \
+                                 cp $(OCCA_DIR)/scripts/codegen/macros.hpp_codegen.in $(OCCA_DIR)/include/occa/defines/codegen/macros.hpp_codegen)
 
 #---[ Compile Library ]---------------------------
 # Setup compiled defines and force rebuild if defines changed
@@ -95,8 +103,9 @@ MAKE_COMPILED_DEFINES := $(shell cat "$(OCCA_DIR)/scripts/build/compiledDefinesT
                                       s,@@OCCA_HIP_ENABLED@@,$(OCCA_HIP_ENABLED),g;\
                                       s,@@OCCA_OPENCL_ENABLED@@,$(OCCA_OPENCL_ENABLED),g;\
                                       s,@@OCCA_METAL_ENABLED@@,$(OCCA_METAL_ENABLED),g;\
-				      												s,@@OCCA_DPCPP_ENABLED@@,$(OCCA_DPCPP_ENABLED),g;\
+                                      s,@@OCCA_DPCPP_ENABLED@@,$(OCCA_DPCPP_ENABLED),g;\
                                       s,@@OCCA_THREAD_SHARABLE_ENABLED@@,$(OCCA_THREAD_SHARABLE_ENABLED),g;\
+                                      s,@@OCCA_MAX_ARGS@@,$(OCCA_MAX_ARGS),g;\
                                       s,@@OCCA_BUILD_DIR@@,$(OCCA_BUILD_DIR),g;"\
                                       > "$(NEW_COMPILED_DEFINES)")
 

README.md

@@ -36,7 +36,7 @@ Mission critical computational science and engineering applications from the pub
 
 ### Minimum
 
-- [CMake] v3.17 or newer
+- [CMake] v3.21 or newer
 - C++17 compiler
 - C11 compiler
 
@@ -59,7 +59,7 @@ For convenience, the shell script `configure-cmake.sh` has been provided to driv
 
 The following demonstrates a typical sequence of shell commands to build, test, and install occa:
 ```shell
-$ ./configure.sh
+$ ./configure-cmake.sh
 $ cmake --build build --parallel <number-of-threads>
 $ ctest --test-dir build --output-on-failure
 $ cmake --install build --prefix install