Rectified funcs upto prod

sarrah-basta · Jul 24, 2022 · 2e2c2d7 · 2e2c2d7
1 parent 48325b1
commit 2e2c2d7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 27 deletions.
diff --git a/no-klu/src/Makefile b/no-klu/src/Makefile
@@ -1,9 +1,8 @@
 CXX = g++
 CXXFLAGS = -g 
 SOURCES1 = kry_example.c nvector_octave.cpp
-SOURCES2 = test_nvector_octave.cpp test_nvector_octave.cpp nvector_octave.cpp
-DEPS1 = nvector_octave.h
-DEPS2 = nvector_octave.h test_nvector.h
+SOURCES2 = test_nvector_octave.cpp test_nvector.cpp nvector_octave.cpp
+DEPS = nvector_octave.h test_nvector.h
 OBJECTS1 = $(SOURCES1:.cpp=.o)
 OBJECTS2 = $(SOURCES2:.cpp=.o)
 EXECUTABLE1 = app 

diff --git a/no-klu/src/nvector_octave.cpp b/no-klu/src/nvector_octave.cpp
@@ -618,24 +618,12 @@ void N_VProd_Octave(N_Vector x, N_Vector y, N_Vector z)
 
 void N_VDiv_Octave(N_Vector x, N_Vector y, N_Vector z)
 {
-  // sunindextype i, N;
-  // realtype *xd, *yd, *zd;
-
-  // xd = yd = zd = NULL;
-
-  // N  = NV_LENGTH_C(x);
-  // xd = NV_DATA_C(x);
-  // yd = NV_DATA_C(y);
-  // zd = NV_DATA_C(z);
-
-  // for (i = 0; i < N; i++)
-  //   zd[i] = xd[i]/yd[i];
 
   ColumnVector *xv, *zv, *yv;
   xv = static_cast<ColumnVector *> NV_CONTENT_C(x);
   zv = static_cast<ColumnVector *> NV_CONTENT_C(z);
   yv = static_cast<ColumnVector *> NV_CONTENT_C(y);
-  // *zv = (*xv)/(*yv);
+  *zv = quotient((*xv),(*yv));
 
   return;
 }

diff --git a/no-klu/src/nvector_octave.o b/no-klu/src/nvector_octave.o
diff --git a/no-klu/src/test b/no-klu/src/test
diff --git a/no-klu/src/test_nvector.cpp b/no-klu/src/test_nvector.cpp
@@ -432,7 +432,7 @@ int Test_N_VSetArrayPointer(N_Vector W, sunindextype local_length, int myid)
   Wdata = (realtype*) malloc(local_length * sizeof(realtype));
   for(i=0; i < local_length; i++){
     Wdata[i] = ONE;
-    printf("\n F Wdata =",i, Wdata[i]);
+    // printf("\n F Wdata =",i, Wdata[i]);
   }
 
   /* attach data to vector */
@@ -444,7 +444,7 @@ int Test_N_VSetArrayPointer(N_Vector W, sunindextype local_length, int myid)
   N_VConst(NEG_HALF,W); N_VPrint(W);
   for(i=0; i < local_length; i++){
     failure += SUNRCompare(Wdata[i], NEG_HALF);
-    printf("\n Wdata =", Wdata[i]);
+    // printf("\n Wdata =", Wdata[i]);
   }
 
   if (failure) {
@@ -1729,13 +1729,11 @@ int Test_N_VCompare(N_Vector X, N_Vector Z, sunindextype local_length, int myid)
       break;
     }
   }
-  N_VPrint(X);
 
   start_time = get_time();
   N_VCompare(ONE, X, Z);
   sync_device(X);
   stop_time = get_time();
-  N_VPrint(Z);
   /* check return vector */
   for(i=0; i < local_length; i++){
 

diff --git a/no-klu/src/test_nvector.o b/no-klu/src/test_nvector.o
diff --git a/no-klu/src/test_nvector_octave.cpp b/no-klu/src/test_nvector_octave.cpp
@@ -213,15 +213,15 @@ int main(int argc, char *argv[])
   // fails += Test_N_VMinQuotientLocal(X, Y, length, 0);
 
   /* local fused reduction operations */
-  printf("\nTesting local fused reduction operations:\n\n");
-  // fails += Test_N_VDotProdMultiLocal(V, length, 0);
+  // printf("\nTesting local fused reduction operations:\n\n");
+  // // fails += Test_N_VDotProdMultiLocal(V, length, 0);
 
-  /* XBraid interface operations */
-  printf("\nTesting XBraid interface operations:\n\n");
+  // /* XBraid interface operations */
+  // printf("\nTesting XBraid interface operations:\n\n");
 
-  fails += Test_N_VBufSize(X, length, 0);
-  fails += Test_N_VBufPack(X, length, 0);
-  fails += Test_N_VBufUnpack(X, length, 0);
+  // fails += Test_N_VBufSize(X, length, 0);
+  // fails += Test_N_VBufPack(X, length, 0);
+  // fails += Test_N_VBufUnpack(X, length, 0);
 
   /* Free vectors */
   N_VDestroy(W);

diff --git a/no-klu/src/test_nvector_octave.o b/no-klu/src/test_nvector_octave.o