Skip to content

Commit

Permalink
Adding more automatic formatting tools
Browse files Browse the repository at this point in the history
  • Loading branch information
tdegeus committed Dec 16, 2022
1 parent b8fbd83 commit a3c418f
Show file tree
Hide file tree
Showing 34 changed files with 642 additions and 625 deletions.
52 changes: 26 additions & 26 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,42 @@ build: false

branches:
only:
- master
- master

platform:
- x64
- x64

image:
- Visual Studio 2017
- Visual Studio 2015
- Visual Studio 2017
- Visual Studio 2015

environment:
matrix:
- MINICONDA: C:\xtensor-conda
- MINICONDA: C:\xtensor-conda

init:
- "ECHO %MINICONDA%"
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set VCVARPATH="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set VCARGUMENT=%PLATFORM%
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" set VCVARPATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- echo "%VCVARPATH% %VCARGUMENT%"
- "%VCVARPATH% %VCARGUMENT%"
- ps: if($env:Platform -eq "x64"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe' C:\Miniconda.exe; echo "Done"}
- ps: if($env:Platform -eq "x86"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86.exe' C:\Miniconda.exe; echo "Done"}
- cmd: C:\Miniconda.exe /S /D=C:\xtensor-conda
- "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%MINICONDA%\\Library\\bin;%PATH%"
- ECHO %MINICONDA%
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set VCVARPATH="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set VCARGUMENT=%PLATFORM%
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" set VCVARPATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- echo "%VCVARPATH% %VCARGUMENT%"
- '%VCVARPATH% %VCARGUMENT%'
- ps: if($env:Platform -eq "x64"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe' C:\Miniconda.exe; echo "Done"}
- ps: if($env:Platform -eq "x86"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86.exe' C:\Miniconda.exe; echo "Done"}
- cmd: C:\Miniconda.exe /S /D=C:\xtensor-conda
- set PATH=%MINICONDA%;%MINICONDA%\Scripts;%MINICONDA%\Library\bin;%PATH%

install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda env create --file environment-dev.yml
- CALL conda.bat activate xtensor
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" set CMAKE_ARGS="-DDISABLE_VS2017=ON"
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set CMAKE_ARGS=""
- cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON -DXTENSOR_USE_XSIMD=ON -DCMAKE_BUILD_TYPE=RELEASE %CMAKE_ARGS% .
- nmake test_xtensor_lib
- cd test
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda env create --file environment-dev.yml
- CALL conda.bat activate xtensor
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" set CMAKE_ARGS="-DDISABLE_VS2017=ON"
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set CMAKE_ARGS=""
- cmake -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON -DXTENSOR_USE_XSIMD=ON -DCMAKE_BUILD_TYPE=RELEASE %CMAKE_ARGS% .
- nmake test_xtensor_lib
- cd test

build_script:
- .\test_xtensor_lib
- .\test_xtensor_lib
74 changes: 37 additions & 37 deletions .azure-pipelines/azure-pipelines-linux-clang.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
jobs:
- job: 'Linux_0'
strategy:
matrix:
clang_6:
llvm_version: '6.0'
clang_7:
llvm_version: '7'
clang_8:
llvm_version: '8'
clang_9:
llvm_version: '9'
clang_10:
llvm_version: '10'
disable_xsimd: 1
pool:
vmImage: ubuntu-18.04
variables:
CC: clang-$(llvm_version)
CXX: clang++-$(llvm_version)
timeoutInMinutes: 360
steps:
- job: Linux_0
strategy:
matrix:
clang_6:
llvm_version: '6.0'
clang_7:
llvm_version: '7'
clang_8:
llvm_version: '8'
clang_9:
llvm_version: '9'
clang_10:
llvm_version: '10'
disable_xsimd: 1
pool:
vmImage: ubuntu-18.04
variables:
CC: clang-$(llvm_version)
CXX: clang++-$(llvm_version)
timeoutInMinutes: 360
steps:

- script: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
if [[ $(llvm_version) == '4.0' || $(llvm_version) == '5.0' ]]; then
sudo apt-get update
sudo apt-get --no-install-suggests --no-install-recommends install gcc-4.9 clang-$(llvm_version)
else
LLVM_VERSION=$(llvm_version)
get -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-$LLVM_VERSION main"
sudo apt-get update
sudo apt-get --no-install-suggests --no-install-recommends install clang-$(llvm_version)
fi
displayName: Install build toolchain
- script: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
if [[ $(llvm_version) == '4.0' || $(llvm_version) == '5.0' ]]; then
sudo apt-get update
sudo apt-get --no-install-suggests --no-install-recommends install gcc-4.9 clang-$(llvm_version)
else
LLVM_VERSION=$(llvm_version)
get -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-$LLVM_VERSION main"
sudo apt-get update
sudo apt-get --no-install-suggests --no-install-recommends install clang-$(llvm_version)
fi
displayName: Install build toolchain
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH

- template: unix-build.yml
- template: unix-build.yml
100 changes: 50 additions & 50 deletions .azure-pipelines/azure-pipelines-linux-gcc.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
jobs:
- job: 'Linux_1'
strategy:
matrix:
gcc_6_disable_xsimd:
gcc_version: '6'
disable_xsimd: 1
gcc_6_disable_exception:
gcc_version: '6'
disable_exception: 1
gcc_6_column_major:
gcc_version: '6'
column_major_layout: 1
gcc_7:
gcc_version: '7'
gcc_7_tbb:
gcc_version: '7'
enable_tbb: 1
gcc_7_openmp:
gcc_version: '7'
enable_openmp: 1
gcc_8:
gcc_version: '8'
check_cyclic_includes: 1
gcc_8_bound_checks:
gcc_version: '8'
bound_checks: 1
build_benchmark: 1
disable_xsimd: 1
gcc_8_cpp17:
gcc_version: '8'
enable_cpp17: 1
gcc_9:
gcc_version: '9'
pool:
vmImage: ubuntu-18.04
variables:
CC: gcc-$(gcc_version)
CXX: g++-$(gcc_version)
timeoutInMinutes: 360
steps:
- job: Linux_1
strategy:
matrix:
gcc_6_disable_xsimd:
gcc_version: '6'
disable_xsimd: 1
gcc_6_disable_exception:
gcc_version: '6'
disable_exception: 1
gcc_6_column_major:
gcc_version: '6'
column_major_layout: 1
gcc_7:
gcc_version: '7'
gcc_7_tbb:
gcc_version: '7'
enable_tbb: 1
gcc_7_openmp:
gcc_version: '7'
enable_openmp: 1
gcc_8:
gcc_version: '8'
check_cyclic_includes: 1
gcc_8_bound_checks:
gcc_version: '8'
bound_checks: 1
build_benchmark: 1
disable_xsimd: 1
gcc_8_cpp17:
gcc_version: '8'
enable_cpp17: 1
gcc_9:
gcc_version: '9'
pool:
vmImage: ubuntu-18.04
variables:
CC: gcc-$(gcc_version)
CXX: g++-$(gcc_version)
timeoutInMinutes: 360
steps:

- script: |
if [[ $(gcc_version) == '6' || $(gcc_version) == '7' || $(gcc_version) == '8' ]]; then
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version)
fi
displayName: Install build toolchain
- script: |
if [[ $(gcc_version) == '6' || $(gcc_version) == '7' || $(gcc_version) == '8' ]]; then
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version)
fi
displayName: Install build toolchain
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH

- template: unix-build.yml
- template: unix-build.yml
52 changes: 26 additions & 26 deletions .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
jobs:
- job: 'OSX'
strategy:
matrix:
macOS_11:
image_name: 'macOS-11'
macOS_12:
image_name: 'macOS-12'
pool:
vmImage: $(image_name)
variables:
CC: clang
CXX: clang++
timeoutInMinutes: 360
steps:
- script: |
echo "Removing homebrew for Azure to avoid conflicts with conda"
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
#> ~/uninstall_homebrew
#chmod +x ~/uninstall_homebrew
#~/uninstall_homebrew -f -q
displayName: Remove homebrew
- job: OSX
strategy:
matrix:
macOS_11:
image_name: macOS-11
macOS_12:
image_name: macOS-12
pool:
vmImage: $(image_name)
variables:
CC: clang
CXX: clang++
timeoutInMinutes: 360
steps:
- script: |
echo "Removing homebrew for Azure to avoid conflicts with conda"
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
#> ~/uninstall_homebrew
#chmod +x ~/uninstall_homebrew
#~/uninstall_homebrew -f -q
displayName: Remove homebrew
- bash: |
echo "##vso[task.prependpath]$CONDA/bin"
sudo chown -R $USER $CONDA
displayName: Add conda to PATH
- bash: |
echo "##vso[task.prependpath]$CONDA/bin"
sudo chown -R $USER $CONDA
displayName: Add conda to PATH
- template: unix-build.yml
- template: unix-build.yml
Loading

0 comments on commit a3c418f

Please sign in to comment.