WIP towards 0.8.0 release

ITpC · Jul 16, 2019 · 4c4f5de · 4c4f5de
1 parent 6c835bf
commit 4c4f5de
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/dockerfiles/Dockerfile.bionic.0.8.0.avx2 b/dockerfiles/Dockerfile.bionic.0.8.0.avx2
@@ -17,12 +17,12 @@ RUN apt-get install -y git
 
 RUN apt-get install -y g++-multilib
 
+RUN apt-get install -y g++-8
+
 RUN apt-get install -y make
 
 RUN apt-get install -y autotools-dev
 
-RUN apt-get install -y libcrypto++-dev
-
 RUN apt-get install -y libpam0g-dev
 
 RUN apt-get install -y libbz2-dev
@@ -49,6 +49,7 @@ WORKDIR ${WORKSPACE}
 
 ADD https://github.com/wolfSSL/wolfssl/archive/v3.15.7-stable.tar.gz ${WORKSPACE}
 
+
 RUN ls -la
 
 RUN tar xzvf v3.15.7-stable.tar.gz
@@ -61,8 +62,28 @@ RUN ./configure CFLAGS="-pipe -O2 -march=native -mtune=native -fomit-frame-point
 
 RUN make all install
 
+ADD https://github.com/weidai11/cryptopp/archive/CRYPTOPP_8_2_0.tar.gz ${WORKSPACE}
+
+RUN tar xzvf ${WORKSPACE}/CRYPTOPP_8_2_0.tar.gz
+
+RUN ls -la
+
+WORKDIR ${WORKSPACE}/cryptopp-CRYPTOPP_8_2_0
+
+RUN make CFLAGS="-pipe -O2 -march=native -mtune=native -fomit-frame-pointer -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops" CXXFLAGS="-pipe -O2 -march=native -mtune=native -fomit-frame-pointer -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops" -j4 libcryptopp.a libcryptopp.so install
+
 WORKDIR ${WORKSPACE}
 
+RUN git clone https://github.com/microsoft/mimalloc.git
+
+WORKDIR ${WORKSPACE}/mimalloc
+
+RUN cmake CFLAGS="-pipe -O2 -march=native -mtune=native -fomit-frame-pointer -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops" .
+
+RUN make -j4 all install
+
+RUN rm -rf ITCLib ITCFramework lar utils LAppS
+
 RUN git clone https://github.com/ITpC/ITCLib.git
 
 RUN git clone https://github.com/ITpC/utils.git

diff --git a/nbproject/Makefile-Release.AVX2.mk b/nbproject/Makefile-Release.AVX2.mk
@@ -67,7 +67,7 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps.avx2: ../utils/dist/Debug/GNU-L
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps.avx2: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	g++ -pipe -Wall -pthread -O2 -mtune=native -march=native -fPIC  -flto -mfpmath=sse -mavx -msse2avx -ftree-vectorize -funroll-loops -fstack-check -fstack-protector-strong -fomit-frame-pointer -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps.avx2 ${OBJECTFILES} ${LDLIBSOPTIONS} -lcryptopp -lluajit-5.1 -lbz2 -lstdc++fs -lpam -lwolfssl
+	g++ -pipe -Wall -pthread -O2 -mtune=native -march=native -fPIC  -flto -mfpmath=sse -mavx -msse2avx -ftree-vectorize -funroll-loops -fstack-check -fstack-protector-strong -fomit-frame-pointer -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps.avx2 ${OBJECTFILES} ${LDLIBSOPTIONS} -lcryptopp -lluajit-5.1 -lbz2 -lstdc++fs -lpam -lwolfssl -lmimalloc
 
 ${OBJECTDIR}/src/getLog.o: src/getLog.cpp nbproject/Makefile-${CND_CONF}.mk
 	${MKDIR} -p ${OBJECTDIR}/src

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
@@ -2428,7 +2428,7 @@
               </makeArtifact>
             </linkerLibProjectItem>
           </linkerLibItems>
-          <commandLine>-lcryptopp -lluajit-5.1 -lbz2 -lstdc++fs -lpam -lwolfssl</commandLine>
+          <commandLine>-lcryptopp -lluajit-5.1 -lbz2 -lstdc++fs -lpam -lwolfssl -lmimalloc</commandLine>
         </linkerTool>
         <requiredProjects>
           <makeArtifact PL="../utils"