0.3rc1

Author: gramian

CITATION.cff

@@ -7,8 +7,8 @@ authors:
 title: matrico
 type: software
 abstract: "A flonum matrix module for CHICKEN Scheme."
-version: 0.2
-date-released: 2022-07-07
+version: 0.3
+date-released: 2022-09-16
 commit:
 license: zlib-Acknowledgement
 repository: https://github.com/gramian/matrico
@@ -19,6 +19,4 @@ keywords:
   - "Matrix Calculations"
   - "Matrix Computations"
   - "Linear Algebra"
-  - "Numerical Mathematics"
-  - "Numerical Linear Algebra"
 

Makefile

@@ -1,21 +1,27 @@
 # matrico Makefile
 
-CSC = csc
-CSI = csi
-CHICKEN_INSTALL = chicken-install
-CHICKEN_PROFILE = chicken-profile
-TEST_NEW_EGG = test-new-egg
+CSC = CHICKEN_REPOSITORY_PATH="/home/ch/opt/CHICKEN/lib/chicken/11/" /home/ch/opt/CHICKEN/bin/csc
+CSI = CHICKEN_REPOSITORY_PATH="/home/ch/opt/CHICKEN/lib/chicken/11/" /home/ch/opt/CHICKEN/bin/csi
+CHICKEN_INSTALL = /home/ch/opt/CHICKEN/bin/chicken-install
+CHICKEN_PROFILE =/home/ch/opt/CHICKEN/bin/chicken-profile
+TEST_NEW_EGG = /home/ch/opt/CHICKEN/bin/test-new-egg
+
+#CSC = csc
+#CSI = csi
+#CHICKEN_INSTALL = chicken-install
+#CHICKEN_PROFILE = chicken-profile
+#TEST_NEW_EGG = test-new-egg
 
 CLARG =
-LEVEL = -O4
+LEVEL = -O3
 DEBUG = -d0
-override FLAGS += -C -O2 -C -pipe
+override FLAGS += -strict-types -C -O2 -C -pipe
 
 VERSION = $(shell csi -b version.scm -p "(matrico-version)")
 
 DIM = 1000
 
-.PHONY: linpack, matmul
+.PHONY: mips, linpack, matmul
 
 default:
 	$(CSC) -shared -emit-import-library matrico $(LEVEL) $(DEBUG) $(FLAGS) matrico.scm
@@ -32,24 +38,35 @@ test_egg_local:
                 tests/check.scm tests/run.scm tests/test-f64vector.scm tests/test-fpmath.scm tests/test-matrico.scm tests/test-utils.scm
 	python3 -m http.server --bind 127.0.0.1 &
 	sleep 1
-	$(TEST_NEW_EGG) matrico http://0.0.0.0:8000/matrico.release-info
+	sed -e '3 c\(uri targz \"http://0.0.0.0:8000/{egg-name}-{egg-release}.tar.gz\")' matrico.release-info > matrico-dev.release-info
+	$(TEST_NEW_EGG) matrico http://0.0.0.0:8000/matrico-dev.release-info
 	pkill -9 -f 'python3 -m http.server'
+	rm matrico-dev.release-info
 
 test_egg_remote:
 	$(TEST_NEW_EGG) matrico https://raw.githubusercontent.com/gramian/matrico/main/matrico.release-info
 
 test_install:
 	CHICKEN_INSTALL_REPOSITORY="/tmp/matrico" $(CHICKEN_INSTALL) -test
-	CHICKEN_REPOSITORY_PATH="`$(CHICKEN_INSTALL) -repository`:/tmp/matrico" $(CSI) -e "(import matrico) (matrico-cite)"
+	CHICKEN_REPOSITORY_PATH="/tmp/matrico:`$(CHICKEN_INSTALL) -repository`" $(CSI) -e "(import matrico) (matrico 'citation)"
 
 iprofile:
-	make matmul LEVEL='-O4' FLAGS='-profile' DIM=1000
+	make matmul LEVEL='-O4' FLAGS='-profile' DIM=100
 	ls -1 PROFILE.* | sort -n | head -n1 | $(CHICKEN_PROFILE)
 
 sprofile:
 	make matmul LEVEL='-O4' DEBUG='-d3' DIM=1000 CLARG='-:P1000'
 	ls -1 PROFILE.* | sort -n | head -n1 | $(CHICKEN_PROFILE)
 
+mips:LEVEL=-O5
+mips:
+	@echo "(include \"matrico.scm\") \
+	       (import matrico) \
+	       (print "BogoMips:" #\space (matrico 'benchmark)) \
+	       (newline) \
+	       (exit)" | $(CSC) $(LEVEL) $(FLAGS) - -o /tmp/miads
+	@/tmp/miads
+
 matmul:LEVEL=-O5
 matmul:
 	@echo "(include \"matrico.scm\") \
@@ -60,7 +77,7 @@ matmul:
 	       (define t0 (current-seconds)) \
 	       (define C (time (mx-dot* A B))) \
 	       (define t1 (current-seconds)) \
-	       (print "Megaflops:" #\space (/ (* $(DIM) $(DIM) $(DIM)) (* (- t1 t0) 1000.0 1000.0))) \
+	       (print "Megaflops:" #\space (inexact->exact (floor (/ (* $(DIM) $(DIM) $(DIM)) (* (- t1 t0) 1000.0 1000.0))))) \
 	       (newline) \
 	       (exit)" | $(CSC) $(LEVEL) $(FLAGS) - -o /tmp/matmul
 	@/tmp/matmul $(CLARG) 2> matmul.txt
@@ -76,7 +93,7 @@ linpack:
 	       (define t0 (current-seconds)) \
 	       (define solver (time (mx-solver A))) \
 	       (define t1 (current-seconds)) \
-	       (print "Megaflops:" #\space (/ (* $(DIM) $(DIM) $(DIM)) (* (- t1 t0) 1000.0 1000.0))) \
+	       (print "Megaflops:" #\space (inexact->exact (floor (/ (* $(DIM) $(DIM) $(DIM)) (* (- t1 t0) 1000.0 1000.0))))) \
 	       (print "Residual:" #\space (mx-norm (mx- (solver b) 1.0) 2)) \
 	       (newline) \
 	       (exit)" | $(CSC) $(LEVEL) $(FLAGS) - -o /tmp/linpack