From 91dea487acb9e1aa29b2cc6123c6b44e29f74e67 Mon Sep 17 00:00:00 2001 From: gf712 Date: Thu, 14 Feb 2019 10:46:54 +0000 Subject: [PATCH] mkl CI config maybe better --- .ci/ci.yml | 14 ++++++++++++-- .ci/macos-steps.yml | 21 +++++++++++++++++---- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.ci/ci.yml b/.ci/ci.yml index dd6357a32b1..53ee196a838 100644 --- a/.ci/ci.yml +++ b/.ci/ci.yml @@ -136,8 +136,18 @@ jobs: pool: vmImage: xcode9-macos10.13 - steps: - - template: ./macos-steps.yml + strategy: + matrix: + vanilla: + steps: + - template: ./macos-steps.yml + parameters: + mkl: false + mkl: + steps: + - template: ./macos-steps.yml + parameters: + mkl: false - job: windows_libshogun displayName: Windows diff --git a/.ci/macos-steps.yml b/.ci/macos-steps.yml index 8c9d69e2511..a4c9dad3970 100644 --- a/.ci/macos-steps.yml +++ b/.ci/macos-steps.yml @@ -20,10 +20,23 @@ steps: brew install ccache pkg-config arpack eigen glpk hdf5 json-c lapack lzo nlopt snappy xz displayName: Install dependencies -- task: CMake@1 - displayName: Setup - inputs: - cmakeArgs: -DBUILD_EXAMPLES=OFF -DBUNDLE_JSON=OFF -DBUNDLE_NLOPT=OFF -DENABLE_TESTING=ON -DENABLE_COVERAGE=OFF -DBUILD_META_EXAMPLES=OFF .. +- ${{ if eq(parameters.mkl, 'true') }}: + - task: CMake@1 + displayName: Setup + variables: + CONDA_DEFAULT_ENV: shogun + CONDA_EXE: $CONDA_EXE + CONDA_PREFIX_1: $CONDA_PREFIX + CONDA_PREFIX: $CONDA_PREFIX/envs/shogun + CONDA_PYTHON_EXE: $CONDA_PREFIX/python + inputs: + cmakeArgs: -DBUILD_EXAMPLES=OFF -DBUNDLE_JSON=OFF -DBUNDLE_NLOPT=OFF -DENABLE_TESTING=ON -DENABLE_COVERAGE=OFF -DBUILD_META_EXAMPLES=OFF .. + +- ${{ if eq(parameters.mkl, 'false') }}: + - task: CMake@1 + displayName: Setup + inputs: + cmakeArgs: -DBUILD_EXAMPLES=OFF -DBUNDLE_JSON=OFF -DBUNDLE_NLOPT=OFF -DENABLE_TESTING=ON -DENABLE_COVERAGE=OFF -DBUILD_META_EXAMPLES=OFF .. - script: make -j4 displayName: Build