From b58ac84f643e042539610dd7c5c5d1a295eb5e66 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 13 Oct 2016 09:45:38 +0530 Subject: [PATCH 1/8] Fix clang --- ext/nmatrix/data/ruby_object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/nmatrix/data/ruby_object.h b/ext/nmatrix/data/ruby_object.h index 6d9d21e3..c909938c 100644 --- a/ext/nmatrix/data/ruby_object.h +++ b/ext/nmatrix/data/ruby_object.h @@ -110,7 +110,7 @@ class RubyObject { inline operator VALUE() const { return rval; } //inline operator uint32_t() const { return NUM2ULONG(this->rval); } inline operator int64_t() const { RETURN_OBJ2NUM(NUM2LONG) } - inline operator uint64_t() const { RETURN_OBJ2NUM(NUM2ULONG) } + //inline operator uint64_t() const { RETURN_OBJ2NUM(NUM2ULONG) } inline operator double() const { RETURN_OBJ2NUM(NUM2DBL) } inline operator float() const { RETURN_OBJ2NUM(NUM2DBL) } From 8441165f747a7f546adba4aaccdd5628c923fbdd Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 20 Oct 2016 13:05:38 +0530 Subject: [PATCH 2/8] libyaml is already installed in travis-ci osx --- travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis.sh b/travis.sh index 3bc23891..b14e6806 100755 --- a/travis.sh +++ b/travis.sh @@ -37,7 +37,7 @@ then # Install ruby ( - brew install bison openssl readline libyaml + brew install bison openssl readline brew link --force openssl RBENV_VERSION=system MAKEOPTS='-j 4' From e63cbb27874f3c8d78bcc02c7d9c75248d90596a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 20 Oct 2016 20:00:07 +0530 Subject: [PATCH 3/8] Move ruby=2.4.0-dev to allow_failures --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34333ed0..1bd340b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,8 +96,16 @@ matrix: # trunk - rvm: ruby-head - rvm: ruby-head-clang - - env: ruby_version=2.4.0-dev USE_OPENBLAS=1 - - env: ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1 + - os: osx + compiler: clang + rvm: 2.2 + env: + - ruby_version=2.4.0-dev USE_OPENBLAS=1 + - os: osx + compiler: clang + rvm: 2.2 + env: + - ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1 # linux with clang - os: linux rvm: 2.3.0-clang From 9c264c4251ab614a243cfc2dceb29eae71250635 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 20 Oct 2016 20:00:52 +0530 Subject: [PATCH 4/8] Drop 1.9.3 from travis as it is not supported --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bd340b0..ad57305a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ env: - USE_REF=1 # Installs OpenBLAS and reference LAPACK, builds and tests nmatrix, nmatrix-lapacke - NO_EXTERNAL_LIB=1 # No external libraries installed, only nmatrix rvm: - - 1.9.3 - 2.0.0-p648 - 2.1.8 - 2.2.4 @@ -91,8 +90,6 @@ matrix: env: - ruby_version=2.1.8 USE_OPENBLAS=1 allow_failures: - # Ruby versions which got EOL - - rvm: 1.9.3 # trunk - rvm: ruby-head - rvm: ruby-head-clang From f727e35c103e14ca9f32a79acbc0af22b9686fcf Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 20 Oct 2016 20:03:42 +0530 Subject: [PATCH 5/8] clang on linux is fine --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad57305a..ba90acb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,9 +103,6 @@ matrix: rvm: 2.2 env: - ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1 - # linux with clang - - os: linux - rvm: 2.3.0-clang # For some reason this OpenBLAS configuration isn't working on travis, disable it for now. - os: linux env: USE_OPENBLAS=1 From 35d04077259fa2386fe9fc1a7e322457f63a5f47 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 20 Oct 2016 20:09:11 +0530 Subject: [PATCH 6/8] OpenBLAS is fine on linux --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba90acb3..8edc2481 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,9 +103,6 @@ matrix: rvm: 2.2 env: - ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1 - # For some reason this OpenBLAS configuration isn't working on travis, disable it for now. - - os: linux - env: USE_OPENBLAS=1 notifications: irc: "chat.freenode.net#sciruby" From 56c85937f3b25fc3d086298696703aa11770c6f8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 20 Oct 2016 20:42:10 +0530 Subject: [PATCH 7/8] Drop json requirement --- nmatrix.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/nmatrix.gemspec b/nmatrix.gemspec index 03ac2086..e22f35dc 100644 --- a/nmatrix.gemspec +++ b/nmatrix.gemspec @@ -57,7 +57,6 @@ EOF gem.add_dependency 'packable', '~> 1.3', '>= 1.3.5' gem.add_development_dependency 'bundler', '~>1.6' - gem.add_development_dependency 'json', '~>2.0.1' if RUBY_VERSION >= '2.1.0' gem.add_development_dependency 'pry', '~>0.10' gem.add_development_dependency 'rake', '~>10.3' gem.add_development_dependency 'rake-compiler', '~>0.8' From 732d4af553b92da0a27b1ddb208b177b75df23f1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 20 Oct 2016 22:05:09 +0530 Subject: [PATCH 8/8] Add verbose to rbenv command in travis.sh This would fix the build timeout issue --- travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis.sh b/travis.sh index b14e6806..2fefe2d1 100755 --- a/travis.sh +++ b/travis.sh @@ -42,7 +42,7 @@ then RBENV_VERSION=system MAKEOPTS='-j 4' CONFIGURE_OPTS="--disable-install-doc --with-out-ext=tk,tk/tkutil --with-opt-dir=/usr/local" - rbenv install $ruby_version + rbenv install --verbose $ruby_version ) gem pristine --all