From a5ce7ef82ec45f609f85dbdc2cdacdb36bc64e0a Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 19:07:15 +0100 Subject: [PATCH 01/13] Update .appveyor.yml --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 31f363f..1a3a13a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,9 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. image: - - Visual Studio 2017 + - Visual Studio 2019 environment: - GENERATOR: "Visual Studio 15 2017 Win64" + GENERATOR: "Visual Studio 16 2019" BOOST_PATH: C:\Libraries\boost_1_69_0 AF_PATH: C:\Program Files\ArrayFire\v3 AF_DISABLE_GRAPHICS: 1 From fe5210f05e0eea2e42a19a0aa028bdb60403e3cc Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 19:41:21 +0100 Subject: [PATCH 02/13] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1a3a13a..c23e757 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,7 +7,7 @@ image: - Visual Studio 2019 environment: - GENERATOR: "Visual Studio 16 2019" + GENERATOR: Visual Studio 16 2019 BOOST_PATH: C:\Libraries\boost_1_69_0 AF_PATH: C:\Program Files\ArrayFire\v3 AF_DISABLE_GRAPHICS: 1 From 81dace3f8ecf24a0e558ca3d8146163819eb78f2 Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 19:50:17 +0100 Subject: [PATCH 03/13] Update .appveyor.yml --- .appveyor.yml | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c23e757..123ed95 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,22 +31,24 @@ clone_folder: C:\khiva-java platform: - x64 before_build: - - ps: | - env - java -version - python --version - pip install -U pip - pip install codecov - if(!(Test-Path -Path "C:\Program Files\ArrayFire" )){ appveyor DownloadFile "http://arrayfire.s3.amazonaws.com/3.6.2/ArrayFire-v3.6.2.exe" } - if(!(Test-Path -Path "C:\Program Files\ArrayFire" )){ .\ArrayFire-v3.6.2.exe /S } - vcpkg install --triplet x64-windows gtest eigen3 - git clone --depth 1 --recurse-submodules -q https://github.com/shapelets/khiva.git C:\khiva-library - cd C:\khiva-library - mkdir build - cd build - cmake .. -G"$env:GENERATOR" -DArrayFire_DIR="$env:AF_PATH/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DBOOST_ROOT="$env:BOOST_PATH" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; - cmake --build . --config Release --target install -- /m - cd C:\khiva-java + - 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 boost-math benchmark + - ps: | + Start-Process "choco" "install nsis" -NoNewWindow -Wait + Start-Process "choco" "install doxygen.install" -NoNewWindow -Wait + Start-Process "choco" "install graphviz" -NoNewWindow -Wait + python -m pip install --upgrade pip + pip3 install sphinx==1.7.5 breathe==4.9.1 sphinx_rtd_theme==0.4.0 + - git clone --depth 1 --recurse-submodules -q https://github.com/shapelets/khiva.git C:\khiva-library + - cd C:\khiva-library + - ps: | + mkdir build + cd build + cmake .. -G"$env:GENERATOR" -DArrayFire_DIR="$env:AF_PATH/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DBOOST_ROOT="$env:BOOST_PATH" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; + cmake --build . --config Release --target install -- /m + cd C:\khiva-java build_script: - ps: mvn clean package on_finish: From 4e9d201843bdef36e0cf885a334aeca67e502b87 Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 20:02:10 +0100 Subject: [PATCH 04/13] Update .appveyor.yml --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 123ed95..5d3a9b4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,6 +14,7 @@ environment: KHIVA_PATH: C:\Program Files\Khiva\v0 KHIVALIB_DIR: $(KHIVA_PATH)\lib VCPKG_ROOT: C:\Tools\vcpkg + PATH: $(AF_PATH)\lib;C:\Python36-x64;C:\Python36-x64\Scripts;$(PATH) matrix: - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 PATH: $(JAVA_HOME)\bin;$(AF_PATH)\lib;$(KHIVALIB_DIR);$(PATH) From 7d99c7482391bb0ba3cf486c4984a16ff254e24a Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 20:15:30 +0100 Subject: [PATCH 05/13] Update .appveyor.yml --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5d3a9b4..46711e3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,7 +14,7 @@ environment: KHIVA_PATH: C:\Program Files\Khiva\v0 KHIVALIB_DIR: $(KHIVA_PATH)\lib VCPKG_ROOT: C:\Tools\vcpkg - PATH: $(AF_PATH)\lib;C:\Python36-x64;C:\Python36-x64\Scripts;$(PATH) + PATH: $(AF_PATH)\lib;C:\Python37-x64;C:\Python37-x64\Scripts;$(PATH) matrix: - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 PATH: $(JAVA_HOME)\bin;$(AF_PATH)\lib;$(KHIVALIB_DIR);$(PATH) @@ -41,7 +41,7 @@ before_build: Start-Process "choco" "install doxygen.install" -NoNewWindow -Wait Start-Process "choco" "install graphviz" -NoNewWindow -Wait python -m pip install --upgrade pip - pip3 install sphinx==1.7.5 breathe==4.9.1 sphinx_rtd_theme==0.4.0 + pip install sphinx==1.7.5 breathe==4.9.1 sphinx_rtd_theme==0.4.0 - git clone --depth 1 --recurse-submodules -q https://github.com/shapelets/khiva.git C:\khiva-library - cd C:\khiva-library - ps: | From ac9975401b4e6f659d59efa136ae233afd3aed4d Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 20:24:51 +0100 Subject: [PATCH 06/13] Update .appveyor.yml --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 46711e3..fd053f9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,7 +35,7 @@ before_build: - 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 boost-math benchmark + - vcpkg install --triplet x64-windows gtest eigen3 benchmark - ps: | Start-Process "choco" "install nsis" -NoNewWindow -Wait Start-Process "choco" "install doxygen.install" -NoNewWindow -Wait @@ -47,7 +47,7 @@ before_build: - ps: | mkdir build cd build - cmake .. -G"$env:GENERATOR" -DArrayFire_DIR="$env:AF_PATH/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DBOOST_ROOT="$env:BOOST_PATH" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; + cmake .. -G"$env:GENERATOR" -DBOOST_ROOT="$env:BOOST_PATH" -DArrayFire_DIR="$env:AF_PATH/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DBOOST_ROOT="$env:BOOST_PATH" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; cmake --build . --config Release --target install -- /m cd C:\khiva-java build_script: From 442b2666b312f99a67609c68606a034dbf0c8728 Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 20:26:44 +0100 Subject: [PATCH 07/13] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index fd053f9..536fe6b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,7 +41,7 @@ before_build: Start-Process "choco" "install doxygen.install" -NoNewWindow -Wait Start-Process "choco" "install graphviz" -NoNewWindow -Wait python -m pip install --upgrade pip - pip install sphinx==1.7.5 breathe==4.9.1 sphinx_rtd_theme==0.4.0 + python -m pip install sphinx==1.7.5 breathe==4.9.1 sphinx_rtd_theme==0.4.0 - git clone --depth 1 --recurse-submodules -q https://github.com/shapelets/khiva.git C:\khiva-library - cd C:\khiva-library - ps: | From 555600fdd4aec3eab239953fb5e852255422a271 Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 20:35:40 +0100 Subject: [PATCH 08/13] Update .appveyor.yml --- .appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 536fe6b..640bc27 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,12 +14,9 @@ environment: KHIVA_PATH: C:\Program Files\Khiva\v0 KHIVALIB_DIR: $(KHIVA_PATH)\lib VCPKG_ROOT: C:\Tools\vcpkg - PATH: $(AF_PATH)\lib;C:\Python37-x64;C:\Python37-x64\Scripts;$(PATH) matrix: - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 - PATH: $(JAVA_HOME)\bin;$(AF_PATH)\lib;$(KHIVALIB_DIR);$(PATH) - JAVA_HOME: C:\Program Files\Java\jdk11 - PATH: $(JAVA_HOME)\bin;$(AF_PATH)\lib;$(KHIVALIB_DIR);$(PATH) matrix: fast_finish: true cache: @@ -32,6 +29,7 @@ clone_folder: C:\khiva-java platform: - x64 before_build: + - SET PATH=%KHIVALIB_DIR%;%JAVA_HOME%;%AF_PATH%\lib;C:\Python37-x64;C:\Python37-x64\Scripts;%PATH% - 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 From 5b0cf93fa5ce6a0000437f0a4d7f46195da49380 Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 20:42:48 +0100 Subject: [PATCH 09/13] Update .appveyor.yml --- .appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 640bc27..1e2b220 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,7 +8,6 @@ image: - Visual Studio 2019 environment: GENERATOR: Visual Studio 16 2019 - BOOST_PATH: C:\Libraries\boost_1_69_0 AF_PATH: C:\Program Files\ArrayFire\v3 AF_DISABLE_GRAPHICS: 1 KHIVA_PATH: C:\Program Files\Khiva\v0 @@ -33,7 +32,7 @@ before_build: - 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 benchmark + - vcpkg install --triplet x64-windows gtest eigen3 boost-math benchmark - ps: | Start-Process "choco" "install nsis" -NoNewWindow -Wait Start-Process "choco" "install doxygen.install" -NoNewWindow -Wait @@ -45,7 +44,7 @@ before_build: - ps: | mkdir build cd build - cmake .. -G"$env:GENERATOR" -DBOOST_ROOT="$env:BOOST_PATH" -DArrayFire_DIR="$env:AF_PATH/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DBOOST_ROOT="$env:BOOST_PATH" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; + cmake .. -G"$env:GENERATOR" -DArrayFire_DIR="$env:AF_PATH/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; cmake --build . --config Release --target install -- /m cd C:\khiva-java build_script: From 534ce9d2a5aa01c7b9103643d5b388652785ca22 Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 20:58:38 +0100 Subject: [PATCH 10/13] Update .appveyor.yml --- .appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1e2b220..badbc8c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,10 +48,12 @@ before_build: cmake --build . --config Release --target install -- /m cd C:\khiva-java build_script: - - ps: mvn clean package + - mvn clean package --batch-mode -DskipTest +test_script: + - mvn clean install --batch-mode on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - - cmd: codecov -F Windows -f C:\khiva-java\target\site\jacoco\jacoco.xml + # - cmd: codecov -F Windows -f C:\khiva-java\target\site\jacoco\jacoco.xml - ps: | $files = Get-ChildItem -Path .\target\surefire-reports -File -Filter *.xml foreach ($file in $files) { From 36bd1e7016c32ad511b5286a82acaef77eb3616c Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 21:06:01 +0100 Subject: [PATCH 11/13] Update .appveyor.yml --- .appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index badbc8c..643af13 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,9 +48,7 @@ before_build: cmake --build . --config Release --target install -- /m cd C:\khiva-java build_script: - - mvn clean package --batch-mode -DskipTest -test_script: - - mvn clean install --batch-mode + - mvn clean package --batch-mode on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) # - cmd: codecov -F Windows -f C:\khiva-java\target\site\jacoco\jacoco.xml From 1d6d613fc3f0053cff96b03fac70620266a2b4bc Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 21:26:23 +0100 Subject: [PATCH 12/13] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 643af13..e649325 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -44,7 +44,7 @@ before_build: - ps: | mkdir build cd build - cmake .. -G"$env:GENERATOR" -DArrayFire_DIR="$env:AF_PATH/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; + cmake .. -G"($env:GENERATOR)" -DArrayFire_DIR="($env:AF_PATH)/cmake" -DCMAKE_TOOLCHAIN_FILE="($env:VCPKG_ROOT)/scripts/buildsystems/vcpkg.cmake" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; cmake --build . --config Release --target install -- /m cd C:\khiva-java build_script: From a02d8317891957ac19514a96271f1d81b68bc04f Mon Sep 17 00:00:00 2001 From: Justo Ruiz Ferrer Date: Mon, 1 Feb 2021 21:29:39 +0100 Subject: [PATCH 13/13] Update .appveyor.yml --- .appveyor.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e649325..0cc5aec 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,12 +41,11 @@ before_build: python -m pip install sphinx==1.7.5 breathe==4.9.1 sphinx_rtd_theme==0.4.0 - git clone --depth 1 --recurse-submodules -q https://github.com/shapelets/khiva.git C:\khiva-library - cd C:\khiva-library - - ps: | - mkdir build - cd build - cmake .. -G"($env:GENERATOR)" -DArrayFire_DIR="($env:AF_PATH)/cmake" -DCMAKE_TOOLCHAIN_FILE="($env:VCPKG_ROOT)/scripts/buildsystems/vcpkg.cmake" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; - cmake --build . --config Release --target install -- /m - cd C:\khiva-java + - mkdir build + - cd build + - cmake .. -G"%GENERATOR%" -DArrayFire_DIR="%AF_PATH%/cmake" -DCMAKE_TOOLCHAIN_FILE="%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake" -DKHIVA_USE_CONAN=OFF -DKHIVA_BUILD_DOCUMENTATION=OFF -DKHIVA_BUILD_BENCHMARKS=OFF -DKHIVA_BUILD_EXAMPLES=OFF -DKHIVA_BUILD_TESTS=OFF; + - cmake --build . --config Release --target install -- /m + - cd C:\khiva-java build_script: - mvn clean package --batch-mode on_finish: