From 5ea4d7aeaedc875636e03e309e6dea765a71b53c Mon Sep 17 00:00:00 2001 From: John Woods Date: Fri, 20 Oct 2017 10:55:29 -0500 Subject: [PATCH] Preparing for release of 0.2.4. --- Manifest.txt | 37 ++++++++++++----- Rakefile | 2 +- ext/nmatrix_java/README.md | 0 nmatrix.gemspec | 6 +-- scripts/mac-brew-gcc.sh | 50 ----------------------- scripts/mac-mavericks-brew-gcc.sh | 22 ---------- {ext/nmatrix => scripts}/ttable_helper.rb | 0 7 files changed, 30 insertions(+), 87 deletions(-) delete mode 100644 ext/nmatrix_java/README.md delete mode 100755 scripts/mac-brew-gcc.sh delete mode 100644 scripts/mac-mavericks-brew-gcc.sh rename {ext/nmatrix => scripts}/ttable_helper.rb (100%) diff --git a/Manifest.txt b/Manifest.txt index c173c684..ed443c2c 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -13,6 +13,16 @@ travis.sh .travis.yml lib/nmatrix.rb lib/nmatrix/atlas.rb +lib/nmatrix/blas.rb +lib/nmatrix/enumerate.rb +lib/nmatrix/homogeneous.rb +lib/nmatrix/math.rb +lib/nmatrix/mkmf.rb +lib/nmatrix/monkeys.rb +lib/nmatrix/nmatrix.rb +lib/nmatrix/shortcuts.rb +lib/nmatrix/version.rb +lib/nmatrix/yale_functions.rb lib/nmatrix/fftw.rb lib/nmatrix/lapack_core.rb lib/nmatrix/lapack_ext_common.rb @@ -25,17 +35,14 @@ lib/nmatrix/io/mat_reader.rb lib/nmatrix/io/point_cloud.rb lib/nmatrix/io/fortran_format.rb lib/nmatrix/io/harwell_boeing.rb -lib/nmatrix/blas.rb -lib/nmatrix/enumerate.rb -lib/nmatrix/homogeneous.rb -lib/nmatrix/math.rb -lib/nmatrix/mkmf.rb -lib/nmatrix/monkeys.rb -lib/nmatrix/nmatrix.rb -lib/nmatrix/rspec.rb -lib/nmatrix/shortcuts.rb -lib/nmatrix/version.rb -lib/nmatrix/yale_functions.rb +lib/nmatrix/cruby/math.rb +lib/nmatrix/jruby/decomposition.rb +lib/nmatrix/jruby/enumerable.rb +lib/nmatrix/jruby/error.rb +lib/nmatrix/jruby/math.rb +lib/nmatrix/jruby/nmatrix_java.rb +lib/nmatrix/jruby/operators.rb +lib/nmatrix/jruby/slice.rb ext/nmatrix/math/cblas_enums.h ext/nmatrix/math/cblas_templates_core.h ext/nmatrix/math/util.h @@ -49,6 +56,14 @@ ext/nmatrix_atlas/math_atlas/gesdd.h ext/nmatrix_atlas/math_atlas/gesvd.h ext/nmatrix_atlas/math_atlas/inc.h ext/nmatrix_atlas/nmatrix_atlas.cpp +ext/nmatrix_java/nmatrix/data/Complex.java +ext/nmatrix_java/nmatrix/math/MathHelper.java +ext/nmatrix_java/nmatrix/storage/dense/ArrayComparator.java +ext/nmatrix_java/nmatrix/util/ArrayGenerator.java +ext/nmatrix_java/nmatrix/util/MatrixGenerator.java +ext/nmatrix_java/nmatrix/util/WrapperType.java +ext/nmatrix_java/test/AssertTests.java +ext/nmatrix_java/test/TestRunner.java ext/nmatrix_lapacke/extconf.rb ext/nmatrix_lapacke/lapacke.cpp ext/nmatrix_lapacke/lapacke/include/lapacke.h diff --git a/Rakefile b/Rakefile index d6a7152f..b7e36b7b 100644 --- a/Rakefile +++ b/Rakefile @@ -240,7 +240,7 @@ task :check_manifest do |task| manifest_files = File.read("Manifest.txt").split git_files = `git ls-files |grep -v 'spec/'`.split - ignore_files = %w{.gitignore .rspec ext/nmatrix/binary_format.txt ext/nmatrix/ttable_helper.rb scripts/mac-brew-gcc.sh} + ignore_files = %w{.gitignore .rspec ext/nmatrix/binary_format.txt scripts/ttable_helper.rb} possible_files = git_files - ignore_files diff --git a/ext/nmatrix_java/README.md b/ext/nmatrix_java/README.md deleted file mode 100644 index e69de29b..00000000 diff --git a/nmatrix.gemspec b/nmatrix.gemspec index e22f35dc..19ac5ad6 100644 --- a/nmatrix.gemspec +++ b/nmatrix.gemspec @@ -24,9 +24,9 @@ Gem::Specification.new do |gem| *********************************************************** Welcome to SciRuby: Tools for Scientific Computing in Ruby! -NMatrix requires a C compiler, and has been tested only -with GCC 4.6+. We are happy to accept contributions -which improve the portability of this project. +NMatrix requires a C/C++ compiler. Clang and GCC are +recommended. JRuby support is experimental, and requires +Java. If you are upgrading from NMatrix 0.1.0 and rely on ATLAS features, please check the README. diff --git a/scripts/mac-brew-gcc.sh b/scripts/mac-brew-gcc.sh deleted file mode 100755 index 68888c9d..00000000 --- a/scripts/mac-brew-gcc.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# Script will not work for GCC 4.8 or 4.9. For those, please see -# mac-mavericks-brew-gcc.sh - -VERSION="4.7.2" # Script should also work with GCC 4.7.1. -PREFIX="/usr/gcc-${VERSION}" -LANGUAGES="c,c++,fortran" -MAKE="make -j 4" - -brew-path() { brew info $1 | head -n3 | tail -n1 | cut -d' ' -f1; } - -# Prerequisites - -brew install gmp mpfr libmpc - -# Next, download & install the latest GCC: - -mkdir -p $PREFIX -mkdir temp-gcc -cd temp-gcc -wget ftp://ftp.gnu.org/gnu/gcc/gcc-$VERSION/gcc-$VERSION.tar.gz -tar xfz gcc-$VERSION.tar.gz -rm gcc-$VERSION.tar.gz -cd gcc-$VERSION - -mkdir build -cd build - -# Older versions of brew need brew-path instead of brew --prefix. -../configure \ - --prefix=$PREFIX \ - --with-gmp=$(brew --prefix gmp) \ - --with-mpfr=$(brew --prefix mpfr) \ - --with-mpc=$(brew --prefix libmpc) \ - --program-suffix=-$VERSION \ - --enable-languages=$LANGUAGES \ - --with-system-zlib \ - --enable-stage1-checking \ - --enable-plugin \ - --enable-lto \ - --disable-multilib - -$MAKE bootstrap - -make install - -# Uncomment for cleanup … -# cd ../../.. -# rm -r temp-gcc diff --git a/scripts/mac-mavericks-brew-gcc.sh b/scripts/mac-mavericks-brew-gcc.sh deleted file mode 100644 index 867d050a..00000000 --- a/scripts/mac-mavericks-brew-gcc.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -brew-path() { brew info $1 | head -n3 | tail -n1 | cut -d' ' -f1; } - -# Try using the following for GCC 4.9: -# -# brew install gmp4 mpfr2 libmpc08 isl011 cloog018 -# -# - -brew install gcc49 --enable-fortran -# Source for this is: http://stackoverflow.com/questions/19535422/os-x-10-9-gcc-links-to-clang - - -# You may wish to re-install your Ruby if you're using rbenv. To do -# so, make sure you've installed openssl, readline, and libyaml. -# -# The commands for this are: -# -# CC=gcc-4.8 RUBY_CONFIGURE_OPTS="--with-openssl-dir=`brew --prefix openssl` --with-readline-dir=`brew --prefix readline` --with-gcc=gcc-4.8 --enable-shared" rbenv install --keep 2.0.0-p247 -# -# \ No newline at end of file diff --git a/ext/nmatrix/ttable_helper.rb b/scripts/ttable_helper.rb similarity index 100% rename from ext/nmatrix/ttable_helper.rb rename to scripts/ttable_helper.rb