Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preparing for release of 0.2.4. #601

Merged
merged 5 commits into from
Dec 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ rvm:
- 2.1.8
- 2.2.4
- 2.3.0
- 2.4.2
- ruby-head
# The latest stable and head versions built by clang
- 2.3.0-clang
Expand Down
19 changes: 19 additions & 0 deletions History.txt
Original file line number Diff line number Diff line change
Expand Up @@ -888,3 +888,22 @@
* Fixed gem installation problem caused by mkmf
abstraction (by @mrkn)

=== 0.2.4 / 2017-12-14

* No major enhancements.

* 2 minor enhancements:

* Eliminated code reuse in math.rb between JRuby and MRI
versions of library (by @prasunanand)

* Slightly simplified #positive_definite? (by
@prasunanand)

* 2 bug fixes:

* Fixed compilation problem on Mac OS X High Sierra (by
@mohawkjohn)

* Fixed failing #block_diagonal spec (due to missing
Array#sum) (by @mohawkjohn)
37 changes: 26 additions & 11 deletions Manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Empty file removed ext/nmatrix_java/README.md
Empty file.
68 changes: 0 additions & 68 deletions ext/nmatrix_java/Rakefile

This file was deleted.

Empty file.
10 changes: 6 additions & 4 deletions lib/nmatrix/mkmf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ def gplusplus_version
$CXXFLAGS += " -O3 -std=#{$CXX_STANDARD} " #-fmax-errors=10 -save-temps
#$CXXFLAGS += " -static -O0 -g -std=#{$CXX_STANDARD} "

CONFIG['warnflags'].gsub!('-Wshorten-64-to-32', '') # doesn't work except in Mac-patched gcc (4.2)
CONFIG['warnflags'].gsub!('-Wdeclaration-after-statement', '')
CONFIG['warnflags'].gsub!('-Wimplicit-function-declaration', '')

if CONFIG.has_key?('warnflags')
CONFIG['warnflags'].gsub!('-Wshorten-64-to-32', '') # doesn't work except in Mac-patched gcc (4.2)
CONFIG['warnflags'].gsub!('-Wdeclaration-after-statement', '')
CONFIG['warnflags'].gsub!('-Wimplicit-function-declaration', '')
end

have_func("rb_array_const_ptr", "ruby.h")
4 changes: 2 additions & 2 deletions lib/nmatrix/shortcuts.rb
Original file line number Diff line number Diff line change
Expand Up @@ -494,11 +494,11 @@ def block_diagonal(*params)
block_sizes << b.shape[0]
end

block_diag_mat = NMatrix.zeros(block_sizes.sum, options)
block_diag_mat = NMatrix.zeros(block_sizes.inject(0,:+), options)
(0...params.length).each do |n|
# First determine the size and position of the n'th block in the block-diagonal matrix
block_size = block_sizes[n]
block_pos = block_sizes[0...n].sum
block_pos = block_sizes[0...n].inject(0,:+)
# populate the n'th block in the block-diagonal matrix
(0...block_size).each do |i|
(0...block_size).each do |j|
Expand Down
6 changes: 3 additions & 3 deletions nmatrix.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
50 changes: 0 additions & 50 deletions scripts/mac-brew-gcc.sh

This file was deleted.

22 changes: 0 additions & 22 deletions scripts/mac-mavericks-brew-gcc.sh

This file was deleted.

File renamed without changes.