Browse code

3.99.7: c++14 and no o3 in win to try faster build

ramon diaz-uriarte (at Phelsuma) authored on 13/09/2022 15:28:36
Showing5 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: OncoSimulR
2 2
 Type: Package
3 3
 Title: Forward Genetic Simulation of Cancer Progression with Epistasis 
4
-Version: 3.99.6
5
-Date: 2022-09-12
4
+Version: 3.99.7
5
+Date: 2022-09-13
6 6
 Authors@R: c(
7 7
 	      person("Ramon", "Diaz-Uriarte", role = c("aut", "cre"),	
8 8
  	   		     email = "rdiaz02@gmail.com"),
... ...
@@ -1,3 +1,7 @@
1
+Changes in version 3.99.7 (2022-09-13):
2
+	- Use c++14 and, in windows, do not use -O3: try to minimize
3
+	  build time.
4
+	  
1 5
 Changes in version 3.99.6 (2022-09-12):
2 6
 	- Udpated exprtk.
3 7
 
... ...
@@ -4,7 +4,11 @@ CXX=g++$(VER)
4 4
 CXX11=g++$(VER)
5 5
 
6 6
 ## This is a C++11 package
7
-CXX_STD = CXX11
7
+## But using C++14 leads to faster INSTALL. In my machine:
8
+## C++11: 6'30"
9
+## C++14: 4'20"
10
+## C++17: 5'08"
11
+CXX_STD = CXX14
8 12
 
9 13
 # This ain't needed
10 14
 # ONCOSIMUL_SRC = BNB_nr.cpp\
... ...
@@ -3,7 +3,7 @@ CC=gcc$(VER)
3 3
 CXX=g++$(VER)
4 4
 CXX11=g++$(VER)
5 5
 
6
-CXX_STD = CXX11
6
+CXX_STD = CXX14
7 7
 ## PKG_CXXFLAGS += -I../inst/miscell
8 8
 
9 9
 ## We have issues under Windoze because of ExprTk, MINGW, etc.
... ...
@@ -12,14 +12,22 @@ CXX_STD = CXX11
12 12
 ## as suggested by K. D. Hansen
13 13
 ## on bioc-devel list on 2019-05-24
14 14
 
15
-MYCXXFLAGS = -Wa,-mbig-obj -O3
15
+## zz1
16
+MYCXXFLAGS = -Wa,-mbig-obj
17
+## MYCXXFLAGS = -Wa,-mbig-obj -O3
16 18
 ## MYCXXFLAGS = -O0
17 19
 
20
+## zz1
18 21
 %.o: %.cpp
19 22
 	$(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) $(MYCXXFLAGS) -c $< -o $@
20 23
 
24
+# %.o: %.cpp
25
+# 	$(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -c $< -o $@
26
+
27
+
21 28
 ## Just in case, pass to the linker too. No effect?. See below.
22
-PKG_LIBS = -Wa,-mbig-obj -O3
29
+## z1
30
+## PKG_LIBS = -Wa,-mbig-obj -O3
23 31
 ## PKG_LIBS = -O3
24 32
 
25 33
 #####################  MAGELLAN   ####################
... ...
@@ -82,6 +90,22 @@ fl_generate: FitnessLandscape/main_fl_generate.c  $(MAGELLAN_LIBS)
82 90
 #########################################################
83 91
 #########################################################
84 92
 
93
+## Open the msys2 shell and do (change path to R)
94
+## export PATH=/x86_64-w64-mingw32.static.posix/bin:$PATH
95
+
96
+## Install
97
+## time /c/R/R-4.2.1/bin/R.exe CMD INSTALL OncoSimulR
98
+
99
+
100
+## Build
101
+## time /c/R/R-4.2.1/bin/R.exe CMD build -keep-empty-dirs --no-resave-data OncoSimulR
102
+
103
+## Check
104
+## time /c/R/R-4.2.1/bin/R.exe CMD check --no-multiarch --no-vignettes --timings OncoSimulR_3.4.0.tar.gz
105
+
106
+
107
+## Build bin
108
+## time /c/R/R-4.2.1/bin/R.exe CMD INSTALL --build OncoSimulR_3.4.0.tar.gz
85 109
 
86 110
 
87 111
 
... ...
@@ -288,3 +312,4 @@ fl_generate: FitnessLandscape/main_fl_generate.c  $(MAGELLAN_LIBS)
288 312
 ##  /c/R/R-testing/bin/x64/R CMD build --keep-empty-dirs --no-resave-data --no-build-vignettes OncoSimulR
289 313
 ##  /c/R/R-testing/bin/x64/R CMD INSTALL --merge-multiarch --build --no-build-vignettes --no-manual OncoSimulR_xyz0.tar.gz
290 314
 
315
+
... ...
@@ -1,15 +1,15 @@
1 1
 \usepackage[%
2
-		shash={c10b9f3},
3
-		lhash={c10b9f3c8917ffe4d9de26a5b91a09855bbddba3},
2
+		shash={ba4087e},
3
+		lhash={ba4087ece38225431d51d7379f18937c3802e8ac},
4 4
 		authname={ramon diaz-uriarte (at Phelsuma)},
5 5
 		authemail={rdiaz02@gmail.com},
6
-		authsdate={2022-07-06},
7
-		authidate={2022-07-06 10:42:14 +0200},
8
-		authudate={1657096934},
6
+		authsdate={2022-07-19},
7
+		authidate={2022-07-19 14:45:26 +0200},
8
+		authudate={1658234726},
9 9
 		commname={ramon diaz-uriarte (at Phelsuma)},
10 10
 		commemail={rdiaz02@gmail.com},
11
-		commsdate={2022-07-06},
12
-		commidate={2022-07-06 10:42:14 +0200},
13
-		commudate={1657096934},
11
+		commsdate={2022-07-19},
12
+		commidate={2022-07-19 14:45:26 +0200},
13
+		commudate={1658234726},
14 14
 		refnames={ (HEAD -> master, origin/master, origin/HEAD)}
15 15
 	]{gitsetinfo}
16 16
\ No newline at end of file