linux-x86_64 builds successfully

iblislin · Dec 18, 2015 · f0028c5 · f0028c5
1 parent d75f9ec
commit f0028c5
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -110,15 +110,14 @@ mxnet-scala/project/plugins/project/
 scala-package/*/target/
 scala-package/*/*/target/
 
+# IDE specific
+*.scala_dependencies
+*.worksheet
+*.idea
+*.iml
 #eclipse
 .classpath
 .project
 .settings
 
-# IDE specific
-mxnet-scala/.scala_dependencies
-mxnet-scala/.worksheet
-mxnet-scala/.idea
-mxnet-scala/*.iml
-
 
diff --git a/scala-package/native/linux-x86_64/pom.xml b/scala-package/native/linux-x86_64/pom.xml
@@ -32,6 +32,39 @@
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>     
 
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <exportAntProperties>true</exportAntProperties>
+              <tasks>
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                <if>
+                  <isset property="intel" />
+                  <then>
+                    <property name="use.cblas" value="0" />
+                    <property name="use.mkl" value="1" />
+                    <property name="cflags.blas" value="-I${intel}/mkl/include" />
+                    <property name="ldflags.blas" value="-L${intel}/mkl/lib -L${intel}/lib" />
+                  </then>
+                  <else>
+                    <property name="use.cblas" value="1" />
+                    <property name="use.mkl" value="0" />
+                    <property name="cflags.blas" value="" />
+                    <property name="ldflags.blas" value="-lcblas" />
+                  </else>
+                </if>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>native-maven-plugin</artifactId>
@@ -46,7 +79,7 @@
             <source>
               <directory>../src/main/native</directory>
               <fileNames>
-                <fileName>ml_dmlc_mxnet_native_c_api.c</fileName>
+                <fileName>ml_dmlc_mxnet_native_c_api.cc</fileName>
               </fileNames>
             </source>
           </sources>
@@ -59,7 +92,12 @@
             </compilerMiddleOption>
           </compilerMiddleOptions>
           <compilerEndOptions>
-            <compilerEndOption>-I../../../include/mxnet</compilerEndOption>
+            <compilerEndOption>-I../../../include</compilerEndOption>
+            <compilerEndOption>-I../../../dmlc-core/include</compilerEndOption>
+            <compilerEndOption>-I../../../mshadow ${cflags.blas}</compilerEndOption>
+            <compilerEndOption>-DMSHADOW_USE_CUDA=0</compilerEndOption>
+            <compilerEndOption>-DMSHADOW_USE_CBLAS=${use.cblas}</compilerEndOption>
+            <compilerEndOption>-DMSHADOW_USE_MKL=${use.mkl}</compilerEndOption>
             <compilerEndOption>-fPIC</compilerEndOption>
           </compilerEndOptions>
           <linkerStartOptions>