cleanup and merge errors in 321

ICLDisco · Feb 14, 2024 · c3c3ae4 · c3c3ae4
1 parent 354ce08
commit c3c3ae4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 31 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -94,12 +94,6 @@ jobs:
       # run: ctest -C $BUILD_TYPE
       run: |
         source ${{github.workspace}}/.github/CI/spack_setup.sh
-        # enable devices only in tests that explicitely require them
-        PARSEC_MCA_device_cuda_enabled=0
-        PARSEC_MCA_device_hip_enabled=0
-        # restrict memory use for oversubscribed runners
-        PARSEC_MCA_device_cuda_memory_use=10
-        PARSEC_MCA_device_hip_memory_use=10
         ctest --output-on-failure
 
     - name: Save Artifact

diff --git a/parsec/mca/device/transfer_gpu.c b/parsec/mca/device/transfer_gpu.c
@@ -108,7 +108,7 @@ datatype_lookup_of_gpu_d2h_task( parsec_execution_stream_t * es,
                                  uint32_t * flow_mask,
                                  parsec_dep_data_description_t * data)
 {
-    (void)es; (void)this_task; (void)flow_mask; (void)data;
+    (void)es; (void)this_task; (void)parent_task; (void)flow_mask; (void)data;
     return PARSEC_SUCCESS;
 }
 

diff --git a/tests/apps/stencil/stencil_1D.jdf b/tests/apps/stencil/stencil_1D.jdf
@@ -10,33 +10,33 @@ extern "C" %{
 const int sizeof_datatype = sizeof(DTYPE);
 
 /**
- * @brief stencil_1D copy data to ghost region 
+ * @brief stencil_1D copy data to ghost region
  *
- * @param [out] A0: output data 
- * @param [in] AL: left input data 
- * @param [in] AR: right input data 
- * @param [in] MB: row tile size 
- * @param [in] NB: column tile size 
- * @param [in] myrank: my rank 
- * @param [in] rank_L: rank of left neighbor 
- * @param [in] rank_R: rank of right neighbor 
- * @param [in] R: radius of ghost region 
- * @param [in] n: column index 
- * @param [in] n_max: max column index 
+ * @param [out] A0: output data
+ * @param [in] AL: left input data
+ * @param [in] AR: right input data
+ * @param [in] MB: row tile size
+ * @param [in] NB: column tile size
+ * @param [in] myrank: my rank
+ * @param [in] rank_L: rank of left neighbor
+ * @param [in] rank_R: rank of right neighbor
+ * @param [in] R: radius of ghost region
+ * @param [in] n: column index
+ * @param [in] n_max: max column index
  */
 static void CORE_copydata_stencil_1D(DTYPE *A0, DTYPE *AL, DTYPE *AR, int MB,
                                   int NB, int myrank, int rank_L, int rank_R,
                                   int R, int n, int n_max) {
     int disp_AL, disp_AR, disp_A0;
 
-    /* Displacement of AL */ 
+    /* Displacement of AL */
     if( myrank == rank_L ) {
         disp_AL = MB * (NB - 2 * R);
     } else {
-        disp_AL = 0; 
+        disp_AL = 0;
     }
 
-    /* Copy AL to left ghost region of A0 */ 
+    /* Copy AL to left ghost region of A0 */
     if( n > 0 ) {
         memcpy((void *)A0, (void *)(AL+disp_AL), MB*R*sizeof(DTYPE));
     }
@@ -71,7 +71,7 @@ R           [ type = "int" ]
 task(t, n)
 
 t = 0 .. iter
-m = t % descA->lmt 
+m = t % descA->lmt
 n = 0 .. descA->lnt-1
 
 myrank = descA->super.myrank
@@ -104,7 +104,7 @@ END
 extern "C" %{
 
 /**
- * @brief Stencil 1D, no-blocking 
+ * @brief Stencil 1D, no-blocking
  *
  * @param [inout] dcA: the data, already distributed and allocated
  * @param [in] iter: iterations
@@ -132,14 +132,14 @@ parsec_stencil_1D_New(parsec_tiled_matrix_t *dcA, int iter, int R)
     exit(1);
   }
 
-  taskpool = parsec_stencil_1D_new(dcA, iter, R); 
+  taskpool = parsec_stencil_1D_new(dcA, iter, R);
   stencil_1D_taskpool = (parsec_taskpool_t*)taskpool;
 
   parsec_add2arena( &taskpool->arenas_datatypes[PARSEC_stencil_1D_FULL_ADT_IDX],
                            MY_TYPE, PARSEC_MATRIX_FULL,
                            1, dcA->mb, dcA->nb, dcA->mb,
                            PARSEC_ARENA_ALIGNMENT_SSE, -1 );
-  
+
   parsec_add2arena( &taskpool->arenas_datatypes[PARSEC_stencil_1D_LR_ADT_IDX],
                            MY_TYPE, PARSEC_MATRIX_FULL,
                            1, dcA->mb, R, dcA->mb,
@@ -160,19 +160,19 @@ void parsec_stencil_1D_Destruct(parsec_taskpool_t *taskpool)
 }
 
 /**
- * @brief Stencil 1D 
- * 
+ * @brief Stencil 1D
+ *
  * @param [inout] dcA: the data, already distributed and allocated
- * @param [in] iter: iterations 
- * @param [in] R: radius 
+ * @param [in] iter: iterations
+ * @param [in] R: radius
  */
 int parsec_stencil_1D(parsec_context_t *parsec,
                       parsec_tiled_matrix_t *A,
                       int iter, int R)
 {
   parsec_taskpool_t *parsec_stencil_1D = NULL;
 
-  parsec_stencil_1D = parsec_stencil_1D_New(A, iter, R); 
+  parsec_stencil_1D = parsec_stencil_1D_New(A, iter, R);
 
   if( parsec_stencil_1D != NULL ){
       parsec_enqueue(parsec, parsec_stencil_1D);