bump to version 1.0.2

fixed a few minor things with the build-process.
jblas-project · Feb 26, 2010 · 759f343 · 759f343
1 parent 199757d
commit 759f343
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ## --- END LICENSE BLOCK ---
 
-VERSION=1.0.1
+VERSION=1.0.2
 
 ######################################################################
 #
@@ -57,6 +57,10 @@ PACKAGE_PATH=$(subst .,/,$(PACKAGE))
 LIB_PATH=native-libs/$(LINKAGE_TYPE)/$(OS_NAME)/$(OS_ARCH)
 FULL_LIB_PATH=native-libs/$(LINKAGE_TYPE)/$(OS_NAME)/$(OS_ARCH_WITH_FLAVOR)
 
+GENERATED_SOURCES=src/$(PACKAGE_PATH)/NativeBlas.java native/NativeBlas.c
+GENERATED_HEADERS=include/org_jblas_NativeBlas.h include/org_jblas_util_ArchFlavor.h
+SHARED_LIBS=$(FULL_LIB_PATH)/$(LIB)jblas.$(SO) $(LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO) 
+
 #######################################################################
 # Pattern rules
 #
@@ -79,18 +83,11 @@ FULL_LIB_PATH=native-libs/$(LINKAGE_TYPE)/$(OS_NAME)/$(OS_ARCH_WITH_FLAVOR)
 #
 
 # The default target
-all	: prepare generate-wrapper compile-native
-
-# create native directory if it doesn't exist
-prepare :
-	test -d native || mkdir native
-
-# Generate the JNI dynamic link library
-compile-native : $(FULL_LIB_PATH)/$(LIB)jblas.$(SO) $(LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO)
+all	:  $(SHARED_LIBS)
 
 # Generate the code for the wrapper (both Java and C)
-generate-wrapper: src/$(PACKAGE_PATH)/NativeBlas.java native/NativeBlas.c src/org/jblas/util/ArchFlavor.java
-	ant javah
+generate-wrapper: $(GENERATED_SOURCES) $(GENERATED_HEADERS)
+
 
 # Clean all object files
 clean:
@@ -110,9 +107,10 @@ endif
 
 # Generating the stubs. This target requires that the blas sources can
 # be found in the $(BLAS) and $(LAPACK) directories.
-src/$(PACKAGE_PATH)/NativeBlas.java native/NativeBlas.c: \
+generated-sources: \
   scripts/fortranwrapper.rb scripts/fortran/types.rb \
-  scripts/fortran/java.rb scripts/java-class.java scripts/java-impl.c
+  scripts/fortran/java.rb scripts/java-class.java scripts/java-impl.c \
+  src/org/jblas/util/ArchFlavor.java src/org/jblas/NativeBlas.java 
 	$(RUBY) scripts/fortranwrapper.rb $(PACKAGE) NativeBlas \
 	$(BLAS)/*.f \
 	$(LAPACK)/[sd]gesv.f \
@@ -123,6 +121,14 @@ src/$(PACKAGE_PATH)/NativeBlas.java native/NativeBlas.c: \
 	$(LAPACK)/[sdcz]geev.f \
 	$(LAPACK)/[sd]getrf.f \
 	$(LAPACK)/[sd]potrf.f 
+	ant javah
+	touch $@
+
+native/NativeBlas.o: generated-sources
+	$(CC) $(CFLAGS) $(INCDIRS) -c native/NativeBlas.c -o $@
+
+native/jblas_arch_flavor.o: generated-sources
+	$(CC) $(CFLAGS) $(INCDIRS) -c native/jblas_arch_flavor.c -o $@
 
 # Move the compile library to the machine specific directory.
 $(FULL_LIB_PATH)/$(LIB)jblas.$(SO) : native/NativeBlas.$(SO)
@@ -144,14 +150,11 @@ sanity-checks:
 
 # Create a tar, extract in a directory, and rebuild from scratch.
 test-dist:
+	make clean all
 	ant clean tar
 	rm -rf jblas-$(VERSION)
 	tar xzvf jblas-$(VERSION).tgz
-	cd jblas-$(VERSION)
-	./configure
-	ant clean jar
-	java -cp jblas-$(VERSION).jar org.jblas.util.SanityChecks
-	cd ..
+	(cd jblas-$(VERSION); ./configure; make -j3; ant jar; LD_LIBRARY_PATH=$(FULL_LIB_PATH):$(LIB_PATH) java -cp jblas-$(VERSION).jar org.jblas.util.SanityChecks)
 
 ######################################################################
 #

diff --git a/README b/README
@@ -1,6 +1,7 @@
 jblas is a matrix library for Java which uses existing high
 performance BLAS and LAPACK libraries like ATLAS.
 
+Version 1.0.2, February 26, 2010
 Version 1.0.1, January 14, 2010
 Version 1.0, December 22, 2009
 Version 0.3, September 17, 2009
@@ -13,8 +14,8 @@ Homepage: http://jblas.org
 
 INSTALL
 
-In principle, all you need is the jblas-1.0.1,jar in your
-classpath. jblas-1.0.1.jar will then automagically extract your platform
+In principle, all you need is the jblas-1.0.2,jar in your
+classpath. jblas-1.0.2.jar will then automagically extract your platform
 dependent native library to a tempfile and load it from there. You can
 also put that file somewhere in your load path ($LD_LIBRARY_PATH for
 Linux, %PATH for Windows).
@@ -45,7 +46,7 @@ HOW TO GET STARTED
 Have a look at javadoc/index.html and javadoc/org/jblas/DoubleMatrix.html
 
 If you want to validate your installation and get some performance
-numbers, try "java -server -jar jblas-1.0.1.jar", or drop the server
+numbers, try "java -server -jar jblas-1.0.2.jar", or drop the server
 in case, you only have the "client" JVM installed.
 
 

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,3 +1,16 @@
+Release 1.0.2 - February 26, 2010
+
+Mostly a bug-fix release for the build-process
+
+- fixed utf-8 unicode issues with javadoc
+- fixed issues with parallel make ("make -j3")
+- fixed issues with SSE2/SSE3 config code
+
+No changes to the libraries, you can keep on using the jar file for
+1.0.1.
+
+----------------------------------------------------------------------
+
 Release 1.0.1 - January 14, 2010
 
 Minor fixes, mostly to do with handling spaces in the configure

diff --git a/build.xml b/build.xml
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <!-- Define directories -->
 
-    <property name="version" value="1.0.1" />
+    <property name="version" value="1.0.2" />
     <property name="src" value="${basedir}/src" />
     <property name="test" value="${basedir}/test" />
     <property name="bin" value="${basedir}/bin" />
@@ -211,18 +211,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <target name="javadoc" depends="generate-float">
         <mkdir dir="${doc}" />
-        <javadoc packagenames="org.jblas.*"
+        <javadoc packagenames="org.jblas.*" encoding="utf-8"
 		sourcepath="${src}" defaultexcludes="yes"
 		destdir="${doc}" author="true" version="true"
 		use="true" windowtitle="jblas" linksource="yes"
 			stylesheetfile="javadoc.css" overview="${src}/overview.html">
             <doctitle>
-	<![CDATA[ <h1>jblas - Linear Algebra for Java</h1> ]]>
+	<![CDATA[ <h1>jblas - Linear Algebra for Java (version ${version})</h1> ]]>
             </doctitle>
             <bottom>
-	<![CDATA[ written by Mikio L. Braun and Johannes Schaback ]]>
+	<![CDATA[ &copy; 2008-2010 by Mikio L. Braun and contributors ]]>
             </bottom>
-            <tag name="dedication" scope="all" description="Dedication:" />
         </javadoc>
     </target>
 
@@ -258,6 +257,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <include name="build.xml" />
                 <include name="Makefile" />
                 <include name="config/*.rb" />
+                <include name="config/*.c" />
                 <include name="config/*.java" />
                 <include name="fortranwrapper.dump" />
                 <include name="README" />
@@ -267,6 +267,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <include name="javadoc.css" />
                 <include name="javadoc/**" />
                 <include name="nbproject/**" />
+                <include name="native/jblas_arch_flavor.c" />
             </tarfileset>
             <tarfileset dir="${basedir}" prefix="jblas-${version}" mode="755"
 		    includes="configure" />

diff --git a/src/org/jblas/util/ArchFlavor.java b/src/org/jblas/util/ArchFlavor.java
@@ -41,7 +41,7 @@
 public class ArchFlavor {
 
     static {
-        try {
+        try { 
             System.loadLibrary("jblas_arch_flavor");
         } catch (UnsatisfiedLinkError e) {
             Logger.getLogger().config("ArchFlavor native library not found in path. Copying native library "