bosilca · cflinto · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -157,6 +157,8 @@ option(PARSEC_DIST_PRIORITIES
   "Favor the communications that unlock the most prioritary tasks" ON)
 option(PARSEC_DIST_COLLECTIVES
   "Use optimized asynchronous operations where collective communication pattern is detected" ON)
+option(PARSEC_ALLOW_PARAMETRIZED_FLOWS
+  "Enable parametrized flows" OFF)
 set   (PARSEC_DIST_SHORT_LIMIT 1 CACHE STRING
   "Use the short protocol (no flow control) for messages smaller than the limit in KB. Performs better if smaller than the MTU")
 
@@ -689,7 +691,7 @@ int main(int argc, char *argv[]) {
     if (CUDAToolkit_FOUND)
       message(STATUS "Found CUDA ${CUDAToolkit_VERSION} in ${CUDAToolkit_LIBRARY_DIR}")
       CMAKE_PUSH_CHECK_STATE()
-      list(APPEND CMAKE_REQUIRED_LIBRARIES CUDA::cudart)
+      list(APPEND CMAKE_REQUIRED_LIBRARIES CUDA::cudart) # This adds the wrong version of cudart if there are multiple versions installed
       if(CUDAToolkit_VERSION VERSION_LESS "4.0")
           set(PARSEC_HAVE_PEER_DEVICE_MEMORY_ACCESS 0)
       else()

diff --git a/parsec/CMakeLists.txt b/parsec/CMakeLists.txt
@@ -122,7 +122,8 @@ set(SOURCES
   maxheap.c
   hbbuffer.c
   datarepo.c
-  termdet.c)
+  termdet.c
+  task_class.c)
 if( PARSEC_PROF_TRACE )
   list(APPEND SOURCES dictionary.c)
 endif( PARSEC_PROF_TRACE )
@@ -302,6 +303,7 @@ if( BUILD_PARSEC )
           ${CMAKE_CURRENT_SOURCE_DIR}/bindthread.h
           ${CMAKE_CURRENT_SOURCE_DIR}/parsec_comm_engine.h
           ${CMAKE_CURRENT_SOURCE_DIR}/include/parsec/deprecated.h
+          ${CMAKE_CURRENT_SOURCE_DIR}/task_class.h
           DESTINATION ${PARSEC_INSTALL_INCLUDEDIR}/parsec)
 
 install(FILES

diff --git a/parsec/data_dist/CMakeLists.txt b/parsec/data_dist/CMakeLists.txt
@@ -1,11 +1,13 @@
 set(sources
-  ${CMAKE_CURRENT_LIST_DIR}/hash_datadist.c)
+  ${CMAKE_CURRENT_LIST_DIR}/hash_datadist.c
+  ${CMAKE_CURRENT_LIST_DIR}/multidimensional_grid.c)
 
 add_subdirectory(matrix)
 
 target_sources(parsec PRIVATE ${sources})
 
 set_property(TARGET parsec
              APPEND PROPERTY
-             PRIVATE_HEADER_H data_dist/hash_datadist.h)
+             PRIVATE_HEADER_H data_dist/hash_datadist.h
+                              data_dist/multidimensional_grid.h)
 
diff --git a/parsec/data_dist/matrix/map_operator.c b/parsec/data_dist/matrix/map_operator.c
@@ -199,7 +199,7 @@ add_task_to_list(parsec_execution_stream_t *es,
 
 static void iterate_successors(parsec_execution_stream_t *es,
                                const parsec_task_t *this_task,
-                               uint32_t action_mask,
+                               parsec_dependency_t action_mask,
                                parsec_ontask_function_t *ontask,
                                void *ontask_arg)
 {
@@ -245,7 +245,7 @@ static void iterate_successors(parsec_execution_stream_t *es,
 
 static int release_deps(parsec_execution_stream_t *es,
                         parsec_task_t *this_task,
-                        uint32_t action_mask,
+                        parsec_dependency_t action_mask,
                         parsec_remote_deps_t *deps)
 {
     parsec_task_t** ready_list;

diff --git a/parsec/data_dist/matrix/redistribute/redistribute_wrapper.c b/parsec/data_dist/matrix/redistribute/redistribute_wrapper.c
@@ -204,4 +204,3 @@ int parsec_redistribute(parsec_context_t *parsec,
 
     return PARSEC_ERR_NOT_SUPPORTED;
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -204,4 +204,3 @@ int parsec_redistribute(parsec_context_t *parsec,

		return PARSEC_ERR_NOT_SUPPORTED;
		}