set default dump parameters aligned with HOP dump

source/Lib/CommonLib/NNInference.h

@@ -422,9 +422,11 @@ public:
       case NN_INPUT_PRED:
         fillInputFromBuf<T>(pic, inferArea, inputs[inputData.index], pic->getPredBufCustom(inferArea), inputData.luma, inputData.chroma, inputData.scale, inputData.shift);
         break;
+#if NNVC_USE_PARTITION_AS_CU_AVERAGE
       case NN_INPUT_PARTITION:
         fillInputFromBuf<T>(pic, inferArea, inputs[inputData.index], pic->getCuAverageBuf(inferArea), inputData.luma, inputData.chroma, inputData.scale, inputData.shift);
         break;
+#endif
       case NN_INPUT_BS:
         fillInputFromBuf<T>(pic, inferArea, inputs[inputData.index], pic->getBsMapBuf(inferArea), inputData.luma, inputData.chroma, inputData.scale, inputData.shift);
         break;
@@ -470,9 +472,11 @@ public:
       case NN_INPUT_PRED:
         fillInputFromBuf<T>(pic, inferArea, inputs[inputData.index], pic->getPredBufCustom(inferArea), inputData.luma, inputData.chroma, inputData.scale, inputData.shift, flip);
         break;
+#if NNVC_USE_PARTITION_AS_CU_AVERAGE
       case NN_INPUT_PARTITION:
         fillInputFromBuf<T>(pic, inferArea, inputs[inputData.index], pic->getCuAverageBuf(inferArea), inputData.luma, inputData.chroma, inputData.scale, inputData.shift, flip);
         break;
+#endif
       case NN_INPUT_BS:
         fillInputFromBuf<T>(pic, inferArea, inputs[inputData.index], pic->getBsMapBuf(inferArea), inputData.luma, inputData.chroma, inputData.scale, inputData.shift, flip);
         break;

source/Lib/CommonLib/TypeDef.h

@@ -92,9 +92,9 @@ using TypeSadl = float;
 #define NNVC_USE_REC_AFTER_DBF                            0 // reconstruction after DBF
 #define NNVC_USE_PRED                                     1 // prediction
 #define NNVC_USE_BS                                       1 // BS of DBF
-#define NNVC_USE_PARTITION_AS_CU_AVERAGE                  1 // average on the CU
+#define NNVC_USE_PARTITION_AS_CU_AVERAGE                  0 // average on the CU
 #define NNVC_USE_QP                                       1 // QP slice
-#define NNVC_USE_SLICETYPE                                1 // slice type
+#define NNVC_USE_SLICETYPE                                0 // slice type
 #define JVET_AC0089_NNVC_USE_BPM_INFO                     1 // JVET-AC0089: dump Block Prediction Mode