Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
updated configure
  • Loading branch information
John Canny committed Oct 11, 2016
1 parent 2ecb4c0 commit c2d21ab
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 29 deletions.
3 changes: 0 additions & 3 deletions jni/src/configure
Expand Up @@ -76,7 +76,6 @@ if [ "$OS" = "apple" ] ; then
GCC="g++"
NVCC="nvcc"
NVCCFLAGS="-c -ccbin=clang -use_fast_math -I$BIDMACH_ROOT/jni/include \
-gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_35,code=sm_35 \
-gencode arch=compute_50,code=sm_50 \
Expand Down Expand Up @@ -182,7 +181,6 @@ else
GCC="g++"
NVCC="nvcc"
NVCCFLAGS="-c -use_fast_math -I$BIDMACH_ROOT/jni/include \
-gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_35,code=sm_35 \
-gencode arch=compute_50,code=sm_50 \
Expand Down Expand Up @@ -231,7 +229,6 @@ elif [ "$OS" = "windows" ] ; then
CFLAGS="/openmp /c /MT /DNDEBUG /O2 /EHsc $CFLAGS" # static linking
CPPFLAGS="/c /MT /DNDEBUG /O2 /EHsc $CFLAGS" # static linking
NVCCFLAGS="-c -use_fast_math -I$BIDMACH_ROOT/jni/include \
-gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_35,code=sm_35 \
-gencode arch=compute_50,code=sm_50 \
Expand Down
56 changes: 30 additions & 26 deletions pom.xml
Expand Up @@ -163,6 +163,36 @@
<classifier>cpu-${osarch}</classifier>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>unpack-resources</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>BIDMach</groupId>
<artifactId>BIDMach</artifactId>
<classifier>cpu-${osarch}</classifier>
<version>${project.version}</version>
<includes>**/*.exe</includes>
<outputDirectory>${project.basedir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>dependgpu</id>
Expand Down Expand Up @@ -230,32 +260,6 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>unpack-resources</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>BIDMach</groupId>
<artifactId>BIDMach</artifactId>
<classifier>cpu-${osarch}</classifier>
<version>${project.version}</version>
<includes>**/*.exe</includes>
<outputDirectory>${project.basedir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
Expand Down

0 comments on commit c2d21ab

Please sign in to comment.