Upgrade to ArrayFire 3.6.2 (#24)

Oscar Torreno · web-flow · commit 466d65cfe41a · 2018-12-28T08:50:17.000+01:00
diff --git a/.CI/travis/install-arrayfire.sh b/.CI/travis/install-arrayfire.sh
@@ -7,17 +7,29 @@
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     brew install fftw freeimage
-    if [ ! -e "installers/arrayfire-unified-3.5.1.pkg" ]; then
-        wget https://github.com/shapelets/arrayfire/releases/download/v3.5.1/arrayfire-unified-3.5.1.pkg -O installers/arrayfire-unified-3.5.1.pkg
+    if [ ! -e "./installers/arrayfire-no-gl.pkg" ]; then
+        wget https://github.com/shapelets/arrayfire/releases/download/v3.6.2/arrayfire-no-gl.pkg -O installers/arrayfire-no-gl.pkg
     fi
 
     # Installs arrayfire
-    sudo installer -pkg installers/arrayfire-unified-3.5.1.pkg -target /
+    sudo installer -pkg ./installers/arrayfire-no-gl.pkg -target /
 else
-    if [ ! -e "installers/ArrayFire-no-gl-v3.5.1_Linux_x86_64.sh" ]; then
-        wget http://arrayfire.s3.amazonaws.com/3.5.1/ArrayFire-no-gl-v3.5.1_Linux_x86_64.sh -O installers/ArrayFire-no-gl-v3.5.1_Linux_x86_64.sh
-        chmod +x installers/ArrayFire-no-gl-v3.5.1_Linux_x86_64.sh
+    sudo apt-get update && \
+    sudo apt-get install -y libboost-all-dev \
+    libfftw3-dev \
+    libfontconfig1-dev \
+    libfreeimage-dev \
+    liblapack-dev \
+    liblapacke-dev \
+    libopenblas-dev
+
+    if [ ! -e "./installers/arrayfire-no-gl.sh" ]; then
+        wget https://github.com/shapelets/arrayfire/releases/download/v3.6.2/arrayfire-no-gl.sh -O installers/arrayfire-no-gl.sh
     fi
 
-    sudo ./installers/ArrayFire-no-gl-v3.5.1_Linux_x86_64.sh --prefix=/usr/local --skip-license
-fi
+    sudo mkdir -p /opt/arrayfire-3
+    sudo bash installers/arrayfire-no-gl.sh --prefix=/opt/arrayfire-3 --skip-license
+    sudo ln -s /opt/arrayfire-3/lib64 /opt/arrayfire-3/lib
+    echo "/opt/arrayfire-3/lib" | sudo tee /etc/ld.so.conf.d/arrayfire.conf
+    sudo ldconfig
+fi
diff --git a/.CI/travis/install-java.sh b/.CI/travis/install-java.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Copyright (c) 2018 Shapelets.io
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections && \
+    sudo add-apt-repository -y ppa:webupd8team/java && \
+    sudo apt-get update && \
+    sudo apt-get install -y oracle-java8-installer
diff --git a/.CI/travis/install-khiva.sh b/.CI/travis/install-khiva.sh
@@ -5,78 +5,77 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if [["$INSTALL_KHIVA_METHOD" == "installer"]]; then
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-        if [ ! -e "installers/khiva-v0.1.0-OnlyCPU.pkg" ]; then
-            wget https://github.com/shapelets/khiva/releases/download/v0.1.0/khiva-v0.1.0-OnlyCPU.pkg -O installers/khiva-v0.1.0-OnlyCPU.pkg
+if [[ "$INSTALL_KHIVA_METHOD" == "installer" ]]; then
+   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        if [ ! -e "./installers/khiva-v0.1.0.pkg" ]; then
+            wget https://github.com/shapelets/khiva/releases/download/v0.1.0/khiva-v0.1.0-OnlyCPU.pkg -O ./installers/khiva-v0.1.0-OnlyCPU.pkg
         fi
-
-        sudo installer -pkg installers/khiva-v0.1.0-OnlyCPU.pkg -target /
+        # Installs Khiva
+        sudo installer -pkg ./installers/khiva-v0.1.0-OnlyCPU.pkg -target /
     else
-        if [ ! -e "installers/khiva-v0.1.0-ci.sh" ]; then
-            wget https://github.com/shapelets/khiva/releases/download/v0.1.0/khiva-v0.1.0-ci.sh -O installers/khiva-v0.1.0-ci.sh
-            chmod +x installers/khiva-v0.1.0-ci.sh
+        if [ ! -e "./installers/khiva-v0.1.0-ci.sh" ]; then
+            wget https://github.com/shapelets/khiva/releases/download/v0.1.0/khiva-v0.1.0-ci.sh -O ./installers/khiva-v0.1.0-ci.sh
+            chmod +x ./installers/khiva-v0.1.0-ci.sh
         fi
-
         sudo ./installers/khiva-v0.1.0-ci.sh --prefix=/usr/local --skip-license
         sudo ldconfig
     fi
+
 else
     # GitHub method
     # Install cmake in Linux, it is already installed in osx
     if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
         # Check if the file already exists
-        if [ ! -e "${TRAVIS_BUILD_DIR}/cmake/cmake-3.11.3-Linux-x86_64.sh" ]; then
-            mkdir -p cmake && cd cmake
-            wget https://cmake.org/files/v3.11/cmake-3.11.3-Linux-x86_64.sh
-            cd ..
+        if [ ! -e "${TRAVIS_BUILD_DIR}/cmakebin/cmake-3.13.2-Linux-x86_64.sh" ]; then
+            mkdir -p cmakebin
+            wget https://github.com/Kitware/CMake/releases/download/v3.13.2/cmake-3.13.2-Linux-x86_64.sh -O cmakebin/cmake-3.13.2-Linux-x86_64.sh
         fi
         # Install cmake
-        mkdir cmakebin
-        cp cmake/cmake-3.11.3-Linux-x86_64.sh cmakebin/cmake-3.11.3-Linux-x86_64.sh
-        cd cmakebin
-        chmod +x cmake-3.11.3-Linux-x86_64.sh
-        sudo ./cmake-3.11.3-Linux-x86_64.sh --skip-license
-        cd ..
+        sudo bash cmakebin/cmake-3.13.2-Linux-x86_64.sh --prefix=./cmakebin/ --skip-license
     fi
 
-    #Installing conan and dependencies
-    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        sudo apt-get update -y
-        sudo apt-get install -y python3 python3-pip
+     #Installing conan and dependencies
+     if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+         sudo apt-get update -y
+         sudo apt-get install -y python3 python3-pip
+         sudo pip3 install setuptools
+         sudo pip3 install conan==1.6.1
+     else
+         brew upgrade pyenv
+         export TRAVIS_PYTHON_VERSION=3.6.5
+         export PATH=$HOME/.pyenv/shims:$HOME/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin:$PATH
+         export PYTHON_VERSION=$(echo $TRAVIS_PYTHON_VERSION | awk -F'.' '{print $1 "." $2}')
+ 
+         pyenv install ${TRAVIS_PYTHON_VERSION} -s
+         pyenv init -
+         pyenv local ${TRAVIS_PYTHON_VERSION}
 
-        # Installing conan
-        sudo pip install conan==1.6.1
-    else
-        brew upgrade pyenv
-        export TRAVIS_PYTHON_VERSION=3.6.5
-        export PATH=$HOME/.pyenv/shims:$HOME/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin:$PATH
-        export PYTHON_VERSION=$(echo $TRAVIS_PYTHON_VERSION | awk -F'.' '{print $1 "." $2}')
-
-        pyenv install ${TRAVIS_PYTHON_VERSION} -s
-        pyenv init -
-        pyenv local ${TRAVIS_PYTHON_VERSION}
+         # Installing conan
+         sudo pip${PYTHON_VERSION} install --upgrade pip
+         sudo pip${PYTHON_VERSION} install conan
+     fi
 
-        # Installing conan
-        sudo pip${PYTHON_VERSION} install --upgrade pip
-        sudo pip${PYTHON_VERSION} install conan
-    fi
-    conan remote add -f conan-mpusz https://api.bintray.com/conan/mpusz/conan-mpusz
+     conan remote add conan-mpusz https://api.bintray.com/conan/mpusz/conan-mpusz
+     if [ $? -ne 0 ]; then
+         conan remote update conan-mpusz https://api.bintray.com/conan/mpusz/conan-mpusz
+     fi
 
     # Cloning Github repo into khiva-library folder
-    git clone https://github.com/shapelets/khiva.git ../khiva-library
-    cd ../khiva-library
+    git clone https://github.com/shapelets/khiva.git khiva-library
+    cd khiva-library
     mkdir -p build && cd build
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         conan install .. -s compiler=apple-clang -s compiler.version=9.1 -s compiler.libcxx=libc++ --build missing
         cmake .. -DKHIVA_ONLY_CPU_BACKEND=ON -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_BENCHMARKS=OFF
-        make install -j8
+         make install -j8
     else
-        conan install .. --build missing
-        ../../khiva-java/cmakebin/bin/cmake .. -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_BENCHMARKS=OFF
+        conan install .. -s compiler.libcxx=libstdc++11 --build missing
+        ../../cmakebin/bin/cmake .. -DKHIVA_ENABLE_COVERAGE=ON -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_BENCHMARKS=OFF
         sudo make install -j8
         sudo ldconfig
     fi
-    # Switching back to the khiva-r folder
-    cd ${TRAVIS_BUILD_DIR}
+    # Switching back to the khiva-python folder
+    cd ..
+    cd ..
 fi
+
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -30,8 +30,8 @@ platform:
     - x64
 before_build:
     - SET PATH=%JAVA_HOME%\bin;%PATH%
-    - ps: if(!(Test-Path -Path "C:\Program Files\ArrayFire" )){ appveyor DownloadFile "https://www.dropbox.com/s/ndt1eaouriiu4qi/ArrayFire-v3.5.1.zip?dl=1" -FileName ArrayFire-v3.5.1.zip }
-    - ps: if(!(Test-Path -Path "C:\Program Files\ArrayFire" )){ 7z x ArrayFire-v3.5.1.zip -o"C:\Program Files" }
+    - ps: if(!(Test-Path -Path "C:\Program Files\ArrayFire" )){ appveyor DownloadFile "https://www.dropbox.com/s/13wnbd1qynjmw0i/ArrayFire-v3.6.2.zip?dl=1" -FileName ArrayFire-v3.6.2.zip }
+    - ps: if(!(Test-Path -Path "C:\Program Files\ArrayFire" )){ 7z x ArrayFire-v3.6.2.zip -o"C:\Program Files" }
     - reg add HKCU\Software\Kitware\CMake\Packages\ArrayFire /v ArrayFire_CMake_DIR /d "C:\Program Files\ArrayFire\v3\cmake" /f
     - vcpkg install --triplet x64-windows gtest eigen3
     - ps: if ($env:INSTALL_KHIVA_METHOD -eq "installer"){
diff --git a/.travis.yml b/.travis.yml
@@ -10,43 +10,24 @@ sudo: required
 matrix:
   include:
     - os: linux
-      dist: trusty
-      env: JDK='Oracle JDK 8'
-      jdk: oraclejdk8
+      dist: xenial
+      env:
+        - JAVA_HOME='/usr/lib/jvm/java-8-oracle'
       cache:
        directories:
          - ${TRAVIS_BUILD_DIR}/installers
          - ${HOME}/.m2
          - ${HOME}/.conan
          - ${TRAVIS_BUILD_DIR}/cmake
-      before_install:
-        - jdk_switcher use oraclejdk8
       install:
+        - source .CI/travis/install-java.sh
         - source .CI/travis/install-arrayfire.sh
         - source .CI/travis/install-khiva.sh
       script:
         - source .CI/travis/build-and-test.sh
       after_success:
         - bash <(curl -s https://codecov.io/bash) -cF Linux  -cf ./target/site/jacoco/jacoco.xml
 
-    - os: linux
-      dist: trusty
-      env: JDK='Oracle JDK 9'
-      jdk: oraclejdk9
-      cache:
-        directories:
-          - ${TRAVIS_BUILD_DIR}/installers
-          - ${HOME}/.m2
-          - ${HOME}/.conan
-          - ${TRAVIS_BUILD_DIR}/cmake
-      before_install:
-        - jdk_switcher use oraclejdk9
-      install:
-        - source .CI/travis/install-arrayfire.sh
-        - source .CI/travis/install-khiva.sh
-      script:
-        - source .CI/travis/build-and-test.sh
-
     - os: osx
       osx_image: xcode9.3
       env:
@@ -93,4 +74,4 @@ matrix:
         - brew cask info java
         - brew cask install java
       script:
-        - source .CI/travis/build-and-test.sh
+        - source .CI/travis/build-and-test.sh
diff --git a/src/test/java/io/shapelets/khiva/MatrixTest.java b/src/test/java/io/shapelets/khiva/MatrixTest.java
@@ -258,8 +258,8 @@ public void testFindBestNDiscordsConsecutive() throws Exception {
             int[] subsequenceIndex = findDiscords[2].getData();
 
             Assert.assertEquals(subsequenceIndex[0], 12, DELTA);
-            String os = System.getenv("TRAVIS_OS_NAME");
-            if (os == null || !os.equals("osx")) {
+            String os = System.getenv("TRAVIS");
+            if (os == null || !os.equals("true")) {
                 Assert.assertNotEquals(subsequenceIndex[1], 11, DELTA);
             } else {
                 Assert.assertEquals(subsequenceIndex[1], 11, DELTA);
