[med-svn] [Git][med-team/examl][upstream] New upstream version 3.0.22

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch upstream at Debian Med / examl


Commits:
60a10856 by Michael R. Crusoe at 2020-06-01T15:47:59+02:00
New upstream version 3.0.22
- - - - -


5 changed files:

- examl/Makefile.AVX.gcc
- examl/Makefile.OMP.AVX.gcc
- examl/Makefile.OMP.SSE3.gcc
- examl/Makefile.SSE3.gcc
- versionHeader/version.h


Changes:

=====================================
examl/Makefile.AVX.gcc
=====================================
@@ -8,7 +8,7 @@ COMMON_FLAGS = -D__SIM_SSE3 -D__AVX -D_OPTIMIZED_FUNCTIONS -msse3 -D_GNU_SOURCE
 OPT_FLAG_1 = -O1
 OPT_FLAG_2 = -O2
 
-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
+CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
 
 LIBRARIES = -lm -mavx
 
@@ -21,13 +21,13 @@ all : clean examl-AVX
 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
 
 examl-AVX : $(objs)
-	$(CC) -o examl-AVX $(objs) $(LIBRARIES) 
+	$(CC) -o examl-AVX $(objs) $(LIBRARIES) $(LDFLAGS)
 
 avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
-	$(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
 
 models.o : models.c $(GLOBAL_DEPS)
-	 $(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c
+	$(CC) $(CFLAGS) $(COMMON_FLAGS) $(OPT_FLAG_1) $(CPPFLAGS) -c -o models.o models.c
 
 bipartitionList.o : bipartitionList.c $(GLOBAL_DEPS)
 evaluatePartialSpecialGeneric.o : evaluatePartialSpecialGeneric.c $(GLOBAL_DEPS)


=====================================
examl/Makefile.OMP.AVX.gcc
=====================================
@@ -8,7 +8,7 @@ COMMON_FLAGS = -D__SIM_SSE3 -D__AVX -D_USE_OMP -fopenmp -D_OPTIMIZED_FUNCTIONS -
 OPT_FLAG_1 = -O1
 OPT_FLAG_2 = -O2
 
-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
+CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
 
 LIBRARIES = -lm -mavx -fopenmp
 
@@ -21,7 +21,7 @@ all : clean examl-OMP-AVX
 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
 
 examl-OMP-AVX : $(objs)
-	$(CC) -o examl-OMP-AVX $(objs) $(LIBRARIES) 
+	$(CC) -o examl-OMP-AVX $(objs) $(LIBRARIES) $(LDFLAGS)
 
 avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
 	$(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c


=====================================
examl/Makefile.OMP.SSE3.gcc
=====================================
@@ -8,7 +8,7 @@ COMMON_FLAGS = -D_USE_OMP -fopenmp -D_GNU_SOURCE -D__SIM_SSE3  -msse3 -fomit-fra
 OPT_FLAG_1 = -O1 
 OPT_FLAG_2 = -O2
 
-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
+CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
 
 LIBRARIES = -lm -fopenmp
 
@@ -21,7 +21,7 @@ all : clean examl-OMP
 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
 
 examl-OMP : $(objs)
-	$(CC) -o examl-OMP $(objs) $(LIBRARIES) 
+	$(CC) -o examl-OMP $(objs) $(LIBRARIES) $(LDFLAGS)
 
 models.o : models.c $(GLOBAL_DEPS)
 	 $(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c


=====================================
examl/Makefile.SSE3.gcc
=====================================
@@ -9,7 +9,7 @@ COMMON_FLAGS = -D_GNU_SOURCE -D__SIM_SSE3  -msse3 -fomit-frame-pointer -funroll-
 OPT_FLAG_1 = -O1 
 OPT_FLAG_2 = -O2
 
-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
+CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
 
 LIBRARIES = -lm
 
@@ -22,7 +22,7 @@ all : clean examl
 GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
 
 examl : $(objs)
-	$(CC) -o examl $(objs) $(LIBRARIES) 
+	$(CC) -o examl $(objs) $(LIBRARIES) $(LDFLAGS)
 
 models.o : models.c $(GLOBAL_DEPS)
 	 $(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c


=====================================
versionHeader/version.h
=====================================
@@ -1,4 +1,4 @@
 #define programName        "ExaML"
-#define programVersion     "3.0.21"
-#define programVersionInt  3021
-#define programDate        "May 29 2018"
+#define programVersion     "3.0.22"
+#define programVersionInt  3022
+#define programDate        "April 21 2020"



View it on GitLab: https://salsa.debian.org/med-team/examl/-/commit/60a1085616ce711626bc93b4f88ebfcce981a05d

-- 
View it on GitLab: https://salsa.debian.org/med-team/examl/-/commit/60a1085616ce711626bc93b4f88ebfcce981a05d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200601/400f3f69/attachment-0001.html>