diff options
| author | Jon Morra <jmorra@eharmony.com> | 2015-01-03 00:55:39 +0300 |
|---|---|---|
| committer | Jon Morra <jmorra@eharmony.com> | 2015-01-03 00:55:39 +0300 |
| commit | 3e5b900b9af92a38147cda35f138c349b790ea90 (patch) | |
| tree | 88869ed833be4deeefee3d027a2ec4faa8c0598f | |
| parent | 21d8e591d754487485cd28a66cf1034123b5302f (diff) | |
| parent | 7eda419bc27f2c9fbc37b061631edb4360e9218d (diff) | |
Merge branch 'master' of github.com:elevatedcareers/vowpal_wabbit into master_jmorra
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | java/pom.xml | 94 |
2 files changed, 85 insertions, 16 deletions
@@ -20,17 +20,21 @@ UNAME := $(shell uname) LIBS = -l boost_program_options -l pthread -l z BOOST_INCLUDE = -I /usr/include BOOST_LIBRARY = -L /usr/lib +NPROCS := 1 ifeq ($(UNAME), Linux) BOOST_LIBRARY += -L /usr/lib/x86_64-linux-gnu + NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) endif ifeq ($(UNAME), FreeBSD) LIBS = -l boost_program_options -l pthread -l z -l compat BOOST_INCLUDE = -I /usr/local/include + NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) endif ifeq "CYGWIN" "$(findstring CYGWIN,$(UNAME))" LIBS = -l boost_program_options-mt -l pthread -l z BOOST_INCLUDE = -I /usr/include + NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) endif ifeq ($(UNAME), Darwin) LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z @@ -46,6 +50,7 @@ ifeq ($(UNAME), Darwin) BOOST_INCLUDE += -I /opt/local/include BOOST_LIBRARY += -L /opt/local/lib endif + NPROCS:=$(shell sysctl -n hw.ncpu) endif #LIBS = -l boost_program_options-gcc34 -l pthread -l z @@ -84,7 +89,7 @@ spanning_tree: cd cluster; $(MAKE) vw: - cd vowpalwabbit; $(MAKE) -j 8 things + cd vowpalwabbit; $(MAKE) -j $(NPROCS) things active_interactor: cd vowpalwabbit; $(MAKE) diff --git a/java/pom.xml b/java/pom.xml index 5ef652bb..628535b2 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,12 +1,37 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>vw</groupId> <artifactId>vw-jni-${os.version}-${os.arch}</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> + <name>Vowpal Wabbit JNI Layer</name> + + <scm> + <connection>scm:git:git@github.com:elevatedcareers/vowpal_wabbit.git</connection> + <url>git@github.com:elevatedcareers/vowpal_wabbit.git</url> + <developerConnection>scm:git:git@github.com:elevatedcareers/vowpal_wabbit.git</developerConnection> + <tag>HEAD</tag> + </scm> + + <distributionManagement> + <!-- use the following if you're not using a snapshot version. --> + <repository> + <uniqueVersion>false</uniqueVersion> + <id>releases</id> + <name>Internal Releases</name> + <url>http://nexus.elevatedcareers.com:8081/nexus/content/repositories/releases</url> + <layout>default</layout> + </repository> + + <!-- use the following if you ARE using a snapshot version. --> + <snapshotRepository> + <id>snapshots</id> + <name>Internal Snapshots</name> + <url>http://nexus.elevatedcareers.com:8081/nexus/content/repositories/snapshots</url> + <layout>default</layout> + </snapshotRepository> + </distributionManagement> <properties> <slf4j.version>1.7.6</slf4j.version> @@ -28,14 +53,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>${project.build.directory}</directory> - <includes> - <include>vw_jni.lib</include> - </includes> - </resource> - </resources> <testResources> <testResource> <directory>${project.build.directory}</directory> @@ -68,7 +85,7 @@ <configuration> <exportAntProperties>true</exportAntProperties> <target> - <exec executable="make" failonerror="true"/> + <exec executable="make" failonerror="true" /> </target> </configuration> </execution> @@ -82,7 +99,7 @@ <exportAntProperties>true</exportAntProperties> <target> <exec executable="make" failonerror="true"> - <arg value="clean"/> + <arg value="clean" /> </exec> </target> </configuration> @@ -145,6 +162,53 @@ <redirectTestOutputToFile>true</redirectTestOutputToFile> </configuration> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>process-classes</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>${project.build.directory}</directory> + <includes> + <include>vw_jni.lib</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.4.2</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-gitexe</artifactId> + <version>1.3</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>default</id> + <goals> + <goal>perform</goal> + </goals> + <configuration> + <pomFileName>java/pom.xml</pomFileName> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> |