From 74f64bb4512d9eb980f52a07b8410880ca32eff0 Mon Sep 17 00:00:00 2001
From: chortas <chortas@fi.uba.ar>
Date: Fri, 28 Jan 2022 19:49:45 -0300
Subject: [PATCH] Add tests

---
 Makefile                        | 11 ++++++++---
 README.md                       | 17 +++++++++++++++--
 fftma_module/gen/example.py     | 34 +++++++++++++++++++++++++++++++++
 fftma_module/gen/lib_src/log.c  |  2 +-
 fftma_module/gen/mem_profile.py | 16 ++++++++++++++++
 fftma_module/gen/test.py        | 34 ---------------------------------
 6 files changed, 74 insertions(+), 40 deletions(-)
 create mode 100644 fftma_module/gen/example.py
 create mode 100644 fftma_module/gen/mem_profile.py
 delete mode 100644 fftma_module/gen/test.py

diff --git a/Makefile b/Makefile
index 805297b..4a227be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-
 install: 
 	source ./script_install.sh
 
@@ -11,9 +10,15 @@ fftma:
 binaries: 
 	./script_fortran.sh
 
-test: binaries
+test: binaries fftma
 	cd tests/integration && python3 -m unittest test.py
 
 perf: binaries
 	cd tests/performance && python3 generation.py
-	cd tests/performance && python3 connectivity.py
\ No newline at end of file
+	cd tests/performance && python3 connectivity.py
+
+test-gen: fftma
+	cd tests/stages/generation && python3 -m unittest test.py
+
+time-gen: fftma
+	cd tests/performance/generation && python3 time.py $(N)
\ No newline at end of file
diff --git a/README.md b/README.md
index f19a670..05cd122 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,32 @@ make binaries
 make run
 ```
 
-## Correr los casos de prueba
+## Pruebas de integración
 
 ```
 make test
 ```
 
+## Pruebas unitarias
+
+### Generacion
+
+```
+make test-gen
+```
+
 ## Correr las pruebas de performance
 
 ```
 make perf
 ```
 
+### Obtener tiempos de generacion
+
+```
+make time-gen N=<tamaño>
+```
+
 ## Instalar el binario FFTMA
 
 ```
@@ -44,4 +58,3 @@ El sistema actualmente se encuentra migrado a Python3 por lo que no se recomiend
 ./script_install_py2.sh
 ```
 
-
diff --git a/fftma_module/gen/example.py b/fftma_module/gen/example.py
new file mode 100644
index 0000000..e2d7652
--- /dev/null
+++ b/fftma_module/gen/example.py
@@ -0,0 +1,34 @@
+from FFTMA import gen
+import numpy as np
+import sys
+
+def generate(n):
+    nx, ny, nz = n,n,n
+    dx, dy, dz = 1.0, 1.0, 1.0
+    seed= 1548762 #rdi(10000,99999)
+    var=1
+    vario=2
+    alpha=1
+    lcx=2
+    lcy=4
+    lcz=16
+    ap1x=1
+    ap1y=0
+    ap1z=0
+    ap2x=0
+    ap2y=1
+    ap2z=0
+
+    v1 = (var, vario, alpha, lcx, lcy, lcz, ap1x, ap1y, ap1z, ap2x, ap2y, ap2z)
+    variograms = [v1]
+
+    mean=15.3245987
+    variance=3.5682389
+    typ=3
+
+    k=gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ)
+    np.save(f"out_{n}.npy",k)
+
+if __name__ == '__main__':
+    N=int(sys.argv[1])
+    generate(N)
\ No newline at end of file
diff --git a/fftma_module/gen/lib_src/log.c b/fftma_module/gen/lib_src/log.c
index 287ac1f..f366a6e 100644
--- a/fftma_module/gen/lib_src/log.c
+++ b/fftma_module/gen/lib_src/log.c
@@ -148,7 +148,7 @@ void log_log(int level, const char *file, int line, const char *fmt, ...) {
   };
 
   char* env_var = getenv("ENV");
-  if (env_var != NULL && strcmp("false", env_var) == 0) return;
+  if (env_var == NULL || strcmp("false", env_var) == 0) return;
   
   char* substr_mem = strstr(fmt, "MEM");
   char* substr_cpu = strstr(fmt, "CPU");
diff --git a/fftma_module/gen/mem_profile.py b/fftma_module/gen/mem_profile.py
new file mode 100644
index 0000000..55d5cba
--- /dev/null
+++ b/fftma_module/gen/mem_profile.py
@@ -0,0 +1,16 @@
+from sympy import N
+from example import generate
+
+from memory_profiler import memory_usage
+
+from memory_profiler import memory_usage
+import sys
+
+if __name__ == '__main__':
+    N=int(sys.argv[1])
+     
+    def run_gen():
+        generate(N)
+
+    mem_usage = memory_usage(run_gen)
+    print('Maximum memory usage: %s' % max(mem_usage))
\ No newline at end of file
diff --git a/fftma_module/gen/test.py b/fftma_module/gen/test.py
deleted file mode 100644
index 7ca3b6d..0000000
--- a/fftma_module/gen/test.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from FFTMA import gen
-import numpy as np
-import gc
-import sys
-
-N=int(sys.argv[1])
-
-nx, ny, nz = N,N,N
-dx, dy, dz = 1.0, 1.0, 1.0
-seed= 1548762 #rdi(10000,99999)
-var=1
-vario=2
-alpha=1
-lcx=2
-lcy=4
-lcz=16
-ap1x=1
-ap1y=0
-ap1z=0
-ap2x=0
-ap2y=1
-ap2z=0
-
-v1 = (var, vario, alpha, lcx, lcy, lcz, ap1x, ap1y, ap1z, ap2x, ap2y, ap2z)
-variograms = [v1]
-
-mean=15.3245987
-variance=3.5682389
-typ=3
-
-k=gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ, 8)
-np.save(f"out_{N}.npy",k)
-del k
-gc.collect()
\ No newline at end of file