Upgrade to ArrayFire 3.6.2 (#41)

Oscar Torreno · web-flow · commit 8b5c74995a4f · 2018-12-27T14:30:00.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
+    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-khiva.sh b/.CI/travis/install-khiva.sh
@@ -5,7 +5,7 @@
 # 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 [[ "$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
@@ -26,18 +26,12 @@ else
     # 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
@@ -48,7 +42,7 @@ else
      fi
 
      conan remote add conan-mpusz https://api.bintray.com/conan/mpusz/conan-mpusz
-     if [$? -ne 0]; then
+     if [ $? -ne 0 ]; then
          conan remote update conan-mpusz https://api.bintray.com/conan/mpusz/conan-mpusz
      fi
 
@@ -61,7 +55,7 @@ else
         cmake .. -DKHIVA_ONLY_CPU_BACKEND=ON -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_BENCHMARKS=OFF
          make install -j8
     else
-        conan install .. --build missing
+        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
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,8 +22,8 @@ clone_folder: C:\khiva-python
 platform:
     - x64
 before_build:
-    - 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,34 +10,34 @@ matrix:
   fast_finish: true
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       python: "3.6"
       cache:
         directories:
           - ${TRAVIS_BUILD_DIR}/installers
           - ${HOME}/.conan
-          - ${TRAVIS_BUILD_DIR}/cmake
+          - ${TRAVIS_BUILD_DIR}/cmakebin
       after_success:
         - codecov -F Linux -X gcov
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       python: "3.5"
       cache:
         directories:
           - ${TRAVIS_BUILD_DIR}/installers
           - ${HOME}/.conan
-          - ${TRAVIS_BUILD_DIR}/cmake
+          - ${TRAVIS_BUILD_DIR}/cmakebin
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       python: "2.7"
       cache:
         directories:
           - ${TRAVIS_BUILD_DIR}/installers
           - ${HOME}/.conan
-          - ${TRAVIS_BUILD_DIR}/cmake
+          - ${TRAVIS_BUILD_DIR}/cmakebin
     - os: osx
       osx_image: xcode9.3
       language: generic
@@ -49,7 +49,6 @@ matrix:
           - $HOME/.pyenv
           - $HOME/Library/Caches/Homebrew
           - ${HOME}/.conan
-          - ${TRAVIS_BUILD_DIR}/cmake
       after_success:
         - codecov -F MacOS -X gcov
     - os: osx
@@ -63,7 +62,6 @@ matrix:
           - $HOME/.pyenv
           - $HOME/Library/Caches/Homebrew
           - ${HOME}/.conan
-          - ${TRAVIS_BUILD_DIR}/cmake
     - os: osx
       osx_image: xcode9.3
       language: generic
@@ -75,7 +73,6 @@ matrix:
           - $HOME/.pyenv
           - $HOME/Library/Caches/Homebrew
           - ${HOME}/.conan
-          - ${TRAVIS_BUILD_DIR}/cmake
 install:
   - source .CI/travis/install.sh
   - source .CI/travis/install-arrayfire.sh
diff --git a/khiva/array.py b/khiva/array.py
@@ -171,7 +171,7 @@ def _create_array(self, data):
         if isinstance(data, list):
             data = np.asarray(data)
         if isinstance(data, pd.DataFrame):
-            data = data.as_matrix()
+            data = data.values
         shape = np.array(data.shape)
         shape = shape[shape > 1]
         shape = deque(shape)
diff --git a/tests/unit_tests/array_unit_tests.py b/tests/unit_tests/array_unit_tests.py
@@ -282,7 +282,7 @@ def testArrayfire(self):
     def testFromPandas(self):
         df = pd.DataFrame([[1, 2, 3, 4], [5, 6, 7, 8]])
         df_array = Array(df, khiva_type=dtype.s32)
-        np.testing.assert_array_equal(df.as_matrix(), df_array.to_pandas().as_matrix())
+        np.testing.assert_array_equal(df.values, df_array.to_pandas().values)
 
     def testLength(self):
         a = Array([1, 2, 3, 4])
diff --git a/tests/unit_tests/matrix_unit_tests.py b/tests/unit_tests/matrix_unit_tests.py
@@ -100,8 +100,8 @@ def test_find_best_n_discords(self):
         a = find_best_n_discords_result[2].to_numpy()
 
         self.assertEqual(a[0], 0)
-        # The test failed in the CPU used in the Travis CI OSX build machine
-        if os.environ.get("TRAVIS_OS_NAME") == "osx":
+        # The test failed in the CPU used in the Travis CI build machine
+        if os.environ.get("TRAVIS") == "true":
             self.assertEqual(a[1], 2)
         else:
             self.assertEqual(a[1], 10)
@@ -117,8 +117,8 @@ def test_find_best_n_discords_multiple_profiles(self):
                                                            stomp_result[1], 3, 2)
         a = find_best_n_discords_result[2].to_numpy()
 
-        # The test failed in the CPU used in the Travis CI OSX build machine
-        if os.environ.get("TRAVIS_OS_NAME") == "osx":
+        # The test failed in the CPU used in the Travis CI build machine
+        if os.environ.get("TRAVIS") == "true":
             np.testing.assert_array_almost_equal(a, np.array([[[0, 2], [0, 2]], [[0, 2], [0, 2]]]),
                                                  decimal=self.DECIMAL)
         else:
@@ -143,8 +143,8 @@ def test_find_best_n_discords_consecutive(self):
         a = find_best_n_discords_result[2].to_numpy()
 
         self.assertEqual(a[0], 12)
-        # The test failed in the CPU used in the Travis CI OSX build machine
-        if os.environ.get("TRAVIS_OS_NAME") == "osx":
+        # The test failed in the CPU used in the Travis CI build machine
+        if os.environ.get("TRAVIS") == "true":
             self.assertEqual(a[1], 11)
         else:
             self.assertNotEqual(a[1], 11)
