fixing test case; linux tested script, works

comp-physics · Aug 27, 2023 · d443048 · d443048
1 parent e665e8c
commit d443048
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/examples/run_basic_mac.sh → examples/run_basic_maclinux.sh b/examples/run_basic_mac.sh → examples/run_basic_maclinux.sh
@@ -9,8 +9,8 @@ make library
 
 #compile "source files" (capiTester.f90), link to the library file created, and run
 gfortran -c ../examples/capiTester.f90 -IobjFiles/
-gfortran -o flibrary libcorelib.a capiTester.o
+gfortran -o flibrary capiTester.o libcorelib.a
 ./flibrary
 
 #check whether python output from PyTorch model = roseNNa's output
-python3 ../test/testChecker.py gemm_small
+python3 ../test/testChecker.py gemm_small
diff --git a/fLibrary/Makefile b/fLibrary/Makefile
@@ -15,14 +15,6 @@ output: $(COMP) $(OBJ2)
 %.o: %.f90
 	$(FC) $(FFLAGS) -c $< -o $@
 
-
-#preprocess: modelParserONNX.py
-   	# arg1 = model structure file (.onnx format)
-   	# arg2 (optional) = weights file (.onnx format)
-	#python3 modelParserONNX.py -f $(args)
-
-   	#for *.mod and *.o files
-
 library: output
 	mkdir -p objFiles
 	ar crv libcorelib.a $(COMP) $(OBJ2)

diff --git a/fLibrary/modelParserONNX.py b/fLibrary/modelParserONNX.py
@@ -431,9 +431,10 @@ def spreadInfo(trueShape, toBeTransformedShape):
             names = {n.name:n.i if n.type==2 else n.ints for n in node.attribute}
             attributes = [names.get('ceil_mode', 0),
                           names.get('pads', [0,0,0,0]),
-                          names.get('strides', [1,1])]
-            modelArch.append(("AveragePool", [ioMap[node.input[0]]], attributes)) #(ceil_mode, pads, strides)
-            f.write(str(node.attribute[1].ints[0]))
+                          names.get('strides', [1,1]),
+			  names.get('kernel_shape', 0)]
+            modelArch.append(("AveragePool", [ioMap[node.input[0]]], attributes[:3])) #(ceil_mode, pads, strides)
+            f.write(str(attributes[-1][0]))
             f.write("\n")
             ioMap[node.output[0]] = ioMap[node.input[0]]