Fortran wrapper

.gitignore

@@ -16,10 +16,13 @@
 /build*/
 /trace/
 /scratch/
+/reports/
 /.vscode/
 
 /workspace.code-workspace
 
 !/docs/*.svg
 
 /include/otter/otter-version.h
+
+/*.sh

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "modules/pyotter"]
+	path = modules/pyotter
+	url = git@github.com:Otter-Taskification/pyotter.git
+	branch = dev

CMakeLists.txt

@@ -17,8 +17,11 @@ option(WITH_EXAMPLES "Generate and build examples for demonstrating Otter" OFF)
 option(WITH_TESTS "Generate and build tests" OFF)
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(OTF2_INCLUDE_DIR "/opt/otf2/include" CACHE STRING "OTF2 include directory")
-set(OTF2_LIB_DIR "/opt/otf2/lib" CACHE STRING "OTF2 library directory")
+set(OTF2_INSTALL_DIR "/opt/otf2" CACHE STRING "OTF2 install directory")
+
+if (CMAKE_C_FLAGS)
+    message(STATUS "Flags added: \"${CMAKE_C_FLAGS}\"")
+endif()
 
 # Select default config type
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -79,7 +82,33 @@ if(NOT "${C_COMPILER_VERSION_MINOR}" STREQUAL "")
     endif()
 endif()
 
-message(STATUS "C compiler selected: ${CMAKE_C_COMPILER_ID} ${C_COMPILER_VERSION}")
+# Extract CXX compiler version as separate components
+execute_process (
+    COMMAND bash -c "${CMAKE_CXX_COMPILER} -dumpversion | tr -d '\n'  | sed 's/\\./\\;/g'" 
+    OUTPUT_VARIABLE CXX_COMPILER_VERSION_LIST
+)
+list(GET CXX_COMPILER_VERSION_LIST 0 CXX_COMPILER_VERSION_MAJOR)
+list(GET CXX_COMPILER_VERSION_LIST 1 CXX_COMPILER_VERSION_MINOR)
+list(GET CXX_COMPILER_VERSION_LIST 2 CXX_COMPILER_VERSION_BUGFIX)
+
+# Build version string component-wise
+set(CXX_COMPILER_VERSION ${CXX_COMPILER_VERSION_MAJOR})
+if(NOT "${CXX_COMPILER_VERSION_MINOR}" STREQUAL "")
+    set(CXX_COMPILER_VERSION "${CXX_COMPILER_VERSION}.${CXX_COMPILER_VERSION_MINOR}")
+    if(NOT "${CXX_COMPILER_VERSION_BUGFIX}" STREQUAL "")
+        set(CXX_COMPILER_VERSION "${CXX_COMPILER_VERSION}.${CXX_COMPILER_VERSION_BUGFIX}")
+    endif()
+endif()
+
+message(STATUS "C compiler selected: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID}) ${C_COMPILER_VERSION}")
+message(STATUS "C++ compiler selected: ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID}) ${CXX_COMPILER_VERSION}")
+
+# # # OMPT # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Check for omp-tools.h
+CHECK_INCLUDE_FILE(omp-tools.h HAVE_OMP_TOOLS_H)
+if(NOT HAVE_OMP_TOOLS_H)
+    message(WARNING "Can't find omp-tools.h - did you specify an OMPT-supporting compiler?")
+endif()
 
 # Detect requirement to use 5.1 features instead of deprecated 5.1 features
 set(USE_OMPT_51 0)
@@ -97,123 +126,190 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Intel")
     endif()
 elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang")
     if("${C_COMPILER_VERSION}" VERSION_GREATER "11.1")
-        message(STATUS "Detected Clang >11")
+	message(STATUS "Detected Clang >11")
         set(USE_OMPT_51 1)
     endif()
+elseif(CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
+    if("${C_COMPILER_VERSION}" VERSION_GREATER_EQUAL "13.0.0")
+        message(STATUS "Detected IntelLLVM >= 13.0.0")
+	set(USE_OMPT_51 1)
+    endif()
 else()
-    message(WARN "Selected C compiler may not be supported")
+    message(WARN " Selected C compiler may not be supported:")
+    message(WARN "   CMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}")
+    message(WARN "   C_COMPILER_VERSION=${C_COMPILER_VERSION}")
 endif()
 
-# Define library components
-add_library(otter-core OBJECT
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/otter-core.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/otter-entry.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/otter-structs.c
-)
-target_include_directories(otter-core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_compile_definitions(otter-core PRIVATE DEBUG_LEVEL=${OTTER_DEBUG_CORE})
-set_property(TARGET otter-core PROPERTY POSITION_INDEPENDENT_CODE ON)
+# Check for otf2.h
+if(DEFINED OTF2_INSTALL_DIR)
+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${OTF2_INSTALL_DIR}/include)
+message(STATUS "Searching for otf2.h in: ${CMAKE_REQUIRED_INCLUDES}")
+else()
+message(STATUS "Searching for otf2.h in default include locations")
+endif()
+CHECK_INCLUDE_FILE(otf2/otf2.h HAVE_OTF2_H)
+if(NOT HAVE_OTF2_H)
+    message(FATAL_ERROR "Can't find otf2.h - did you specify OTF2_INSTALL_DIR?")
+endif()
+
+# Check OTF2 version found
+find_path(OTF2_INCLUDE_DIR otf2.h 
+    PATHS ${OTF2_INSTALL_DIR}/include/otf2)
+message(STATUS OTF2_INCLUDE_DIR=${OTF2_INCLUDE_DIR})
+file(READ "${OTF2_INCLUDE_DIR}/OTF2_GeneralDefinitions.h" otf2_defs_h)
 
-add_library(otter-trace OBJECT
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace-core.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace-structs.c
+string(REGEX MATCH "#define OTF2_VERSION_MAJOR[ \t]+[0-9]+" OTF2_VERSION_MAJOR_DEF "${otf2_defs_h}")
+string(REGEX REPLACE "#define OTF2" "" OTF2_VERSION_MAJOR_R "${OTF2_VERSION_MAJOR_DEF}")
+string(REGEX MATCH "[0-9]+" OTF2_VERSION_MAJOR "${OTF2_VERSION_MAJOR_R}")
+
+string(REGEX MATCH "#define OTF2_VERSION_MINOR[ \t]+[0-9]+" OTF2_VERSION_MINOR_DEF "${otf2_defs_h}")
+string(REGEX REPLACE "#define OTF2" "" OTF2_VERSION_MINOR_R "${OTF2_VERSION_MINOR_DEF}")
+string(REGEX MATCH "[0-9]+" OTF2_VERSION_MINOR "${OTF2_VERSION_MINOR_R}")
+
+string(REGEX MATCH "#define OTF2_VERSION_BUGFIX[ \t]+[0-9]+" OTF2_VERSION_BUGFIX_DEF "${otf2_defs_h}")
+string(REGEX REPLACE "#define OTF2" "" OTF2_VERSION_BUGFIX_R "${OTF2_VERSION_BUGFIX_DEF}")
+string(REGEX MATCH "[0-9]+" OTF2_VERSION_BUGFIX "${OTF2_VERSION_BUGFIX_R}")
+
+message(STATUS "Using OTF2 v${OTF2_VERSION_MAJOR}.${OTF2_VERSION_MINOR}.${OTF2_VERSION_BUGFIX}")
+
+if(NOT "${OTF2_VERSION_MAJOR}.${OTF2_VERSION_MINOR}" STREQUAL "2.3")
+    message(FATAL_ERROR "Otter requires OTF2 v2.3")
+endif()
+
+# OMPT event source
+add_library(otter-events-ompt OBJECT
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/events/ompt/otter-core.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/events/ompt/otter-entry.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/types/otter-structs.c
 )
-target_include_directories(otter-trace PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_compile_definitions(otter-trace PRIVATE DEBUG_LEVEL=${OTTER_DEBUG_TRACE})
-set_property(TARGET otter-trace PROPERTY POSITION_INDEPENDENT_CODE ON)
+target_include_directories(otter-events-ompt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_compile_options(otter-events-ompt BEFORE PRIVATE ${CMAKE_C_FLAGS})
+target_compile_definitions(otter-events-ompt PRIVATE DEBUG_LEVEL=${OTTER_DEBUG_CORE})
+set_property(TARGET otter-events-ompt PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+# Serial event source
+add_library(otter-events-serial OBJECT
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/events/serial/otter-serial.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/events/serial/otter-serial.F90
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/types/otter-structs.c
+)
+target_include_directories(otter-events-serial PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_compile_options(otter-events-serial BEFORE PRIVATE ${CMAKE_C_FLAGS})
+target_compile_definitions(otter-events-serial PRIVATE DEBUG_LEVEL=${OTTER_DEBUG_CORE})
+set_property(TARGET otter-events-serial PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+# Trace component for OMP mode
+add_library(otter-trace-ompt OBJECT
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-core.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-location.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-parallel.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-workshare.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-master.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-sync.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-task.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-archive.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-unique-refs.c
+)
+target_include_directories(otter-trace-ompt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_compile_definitions(otter-trace-ompt PRIVATE DEBUG_LEVEL=${OTTER_DEBUG_TRACE})
+set_property(TARGET otter-trace-ompt PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+# Trace component for serial mode
+add_library(otter-trace-serial OBJECT
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-core.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-location.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-parallel.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-workshare.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-master.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-sync.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-region-task.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-archive.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/trace/trace-unique-refs.c
+)
+target_include_directories(otter-trace-serial PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_compile_definitions(otter-trace-serial PRIVATE DEBUG_LEVEL=${OTTER_DEBUG_TRACE})
+set_property(TARGET otter-trace-serial PROPERTY POSITION_INDEPENDENT_CODE ON)
+# Add define to signify serial tracing mode
+target_compile_definitions(otter-trace-serial PRIVATE OTTER_SERIAL_MODE)
 
+# Datatypes component
 add_library(otter-dtype OBJECT
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/dt-queue.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/dt-stack.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/types/dt-queue.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/types/dt-stack.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/otter/types/char_ref_registry.cpp
 )
 target_include_directories(otter-dtype PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_compile_definitions(otter-dtype PRIVATE DEBUG_LEVEL=${OTTER_DEBUG_DTYPE})
 set_property(TARGET otter-dtype PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-# Link component objects into shared library
-add_library(otter
-    $<TARGET_OBJECTS:otter-core>
-    $<TARGET_OBJECTS:otter-trace>
+# Otter library compiled for OMP mode
+if(HAVE_OMP_TOOLS_H)
+add_library(otter-ompt
+    $<TARGET_OBJECTS:otter-events-ompt>
+    $<TARGET_OBJECTS:otter-trace-ompt>
     $<TARGET_OBJECTS:otter-dtype>
 )
+install(TARGETS otter-ompt DESTINATION lib)
+target_link_libraries(otter-ompt pthread)
+target_link_libraries(otter-ompt otf2)
+if(DEFINED OTF2_INSTALL_DIR)
+    target_link_libraries(otter-ompt -L${OTF2_INSTALL_DIR}/lib)
+endif()
+else()
+message(WARNING "otter-ompt target was not generated as omp-tools.h is not available")
+endif()
 
-# Specify Otter install location
-install(TARGETS otter DESTINATION lib)
-
-# Configure version header
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/otter/otter-version.h.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/otter/otter-version.h
+# Otter library compiled for serial mode
+add_library(otter-serial
+    $<TARGET_OBJECTS:otter-events-serial>
+    $<TARGET_OBJECTS:otter-trace-serial>
+    $<TARGET_OBJECTS:otter-dtype>
 )
+set_target_properties(otter-serial PROPERTIES PUBLIC_HEADER "include/otter/otter-serial.h")
 
-# Link to dependencies
-target_link_libraries(otter pthread)
-
-# # # OMPT # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Check for omp-tools.h
-CHECK_INCLUDE_FILE(omp-tools.h HAVE_OMP_TOOLS_H)
-if(NOT HAVE_OMP_TOOLS_H)
-    message(FATAL_ERROR "Can't find omp-tools.h - did you specify an OMPT-supporting compiler?")
+# # # OTF2 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Add OTF2 install directory if it was specified
+if(DEFINED OTF2_INSTALL_DIR)
+    target_include_directories(otter-events-ompt PRIVATE ${OTF2_INSTALL_DIR}/include)
+    target_include_directories(otter-events-serial PRIVATE ${OTF2_INSTALL_DIR}/include)
+    target_include_directories(otter-trace-ompt PRIVATE ${OTF2_INSTALL_DIR}/include)
+    target_include_directories(otter-trace-serial PRIVATE ${OTF2_INSTALL_DIR}/include)
+    target_include_directories(otter-dtype PRIVATE ${OTF2_INSTALL_DIR}/include)
 endif()
 
 # Flag that we should use OMPT 5.1 features
 if(USE_OMPT_51)
     message(STATUS "Using OMPT 5.1")
-    target_compile_definitions(otter-core PRIVATE USE_OMPT_MASKED)
-    target_compile_definitions(otter-trace PRIVATE USE_OMPT_MASKED)
+    target_compile_definitions(otter-events-ompt PRIVATE USE_OMPT_MASKED)
+    target_compile_definitions(otter-trace-ompt PRIVATE USE_OMPT_MASKED)
 else()
     message(STATUS "Not using OMPT 5.1")
 endif()
 
-# # # OTF2 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Add OTF2 include directory if it was specified
-set(HAVE_OTF2_INCLUDE_DIR FALSE)
-if(DEFINED OTF2_INCLUDE_DIR)
-    target_include_directories(otter-core PRIVATE ${OTF2_INCLUDE_DIR})
-    target_include_directories(otter-trace PRIVATE ${OTF2_INCLUDE_DIR})
-    set(HAVE_OTF2_INCLUDE_DIR TRUE)
-    message(STATUS "OTF2 include dir was specified")
-endif()
-
-target_link_libraries(otter otf2)
-# Add library directory for OTF2 if it was specified
-if(DEFINED OTF2_LIB_DIR)
-    target_link_libraries(otter -L${OTF2_LIB_DIR})
-endif()
-
-# Check for otf2.h
-set(CMAKE_REQUIRED_INCLUDES $<$<BOOL:HAVE_OTF2_INCLUDE_DIR>:${OTF2_INCLUDE_DIR}>)
-CHECK_INCLUDE_FILE(otf2/otf2.h HAVE_OTF2_H)
-if(NOT HAVE_OTF2_H)
-    message(FATAL_ERROR "Can't find otf2.h - did you specify OTF2_INCLUDE_DIR?")
-endif()
-
-# Check OTF2 version found
-file(READ "${OTF2_INCLUDE_DIR}/otf2/OTF2_GeneralDefinitions.h" otf2_defs_h)
-
-string(REGEX MATCH "#define OTF2_VERSION_MAJOR[ \t]+[0-9]+" OTF2_VERSION_MAJOR_DEF "${otf2_defs_h}")
-string(REGEX REPLACE "#define OTF2" "" OTF2_VERSION_MAJOR_R "${OTF2_VERSION_MAJOR_DEF}")
-string(REGEX MATCH "[0-9]+" OTF2_VERSION_MAJOR "${OTF2_VERSION_MAJOR_R}")
-
-string(REGEX MATCH "#define OTF2_VERSION_MINOR[ \t]+[0-9]+" OTF2_VERSION_MINOR_DEF "${otf2_defs_h}")
-string(REGEX REPLACE "#define OTF2" "" OTF2_VERSION_MINOR_R "${OTF2_VERSION_MINOR_DEF}")
-string(REGEX MATCH "[0-9]+" OTF2_VERSION_MINOR "${OTF2_VERSION_MINOR_R}")
-
-string(REGEX MATCH "#define OTF2_VERSION_BUGFIX[ \t]+[0-9]+" OTF2_VERSION_BUGFIX_DEF "${otf2_defs_h}")
-string(REGEX REPLACE "#define OTF2" "" OTF2_VERSION_BUGFIX_R "${OTF2_VERSION_BUGFIX_DEF}")
-string(REGEX MATCH "[0-9]+" OTF2_VERSION_BUGFIX "${OTF2_VERSION_BUGFIX_R}")
+# Specify Otter install location
+install(TARGETS otter-serial LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include/otter)
 
-message(STATUS "Using OTF2 v${OTF2_VERSION_MAJOR}.${OTF2_VERSION_MINOR}.${OTF2_VERSION_BUGFIX}")
+# Configure version header
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/otter/otter-version.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/otter/otter-version.h
+)
 
-if(NOT "${OTF2_VERSION_MAJOR}.${OTF2_VERSION_MINOR}" STREQUAL "2.3")
-    message(FATAL_ERROR "Otter requires OTF2 v2.3")
+# Link to dependencies
+target_link_libraries(otter-serial pthread)
+target_link_libraries(otter-serial otf2)
+# Add library directory for OTF2 if it was specified
+if(DEFINED OTF2_INSTALL_DIR)
+    target_link_libraries(otter-serial -L${OTF2_INSTALL_DIR}/lib)
 endif()
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 # # # Build examples for demonstrating Otter  # # # # # # # # # # # # # # #
 
+message(STATUS "Detecting examples")
 if (WITH_EXAMPLES)
+    message(STATUS "Adding examples")
     add_subdirectory(src/otter/examples)
 endif()