Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4dc7112

Browse files
committed
Applying clang-format
1 parent7cb644a commit4dc7112

File tree

53 files changed

+1470
-1024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1470
-1024
lines changed

‎.appveyor.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ build: false
33
os:Visual Studio 2015
44

55
platform:
6-
-x64
6+
-x64
77

88
environment:
99
matrix:
10-
-MINICONDA:C:\xtensor-conda
10+
-MINICONDA:C:\xtensor-conda
1111

1212
init:
13-
-"ECHO %MINICONDA%"
14-
-C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\VC\vcvarsall.bat %PLATFORM%
15-
-ps:if($env:Platform -eq "x64"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe' C:\Miniconda.exe; echo "Done"}
16-
-ps:if($env:Platform -eq "x86"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86.exe' C:\Miniconda.exe; echo "Done"}
17-
-cmd:C:\Miniconda.exe /S /D=C:\xtensor-conda
18-
-"set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%MINICONDA%\\Library\\bin;%PATH%"
13+
-ECHO %MINICONDA%
14+
-C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\VC\vcvarsall.bat %PLATFORM%
15+
-ps:if($env:Platform -eq "x64"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe' C:\Miniconda.exe; echo "Done"}
16+
-ps:if($env:Platform -eq "x86"){Start-FileDownload 'http://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86.exe' C:\Miniconda.exe; echo "Done"}
17+
-cmd:C:\Miniconda.exe /S /D=C:\xtensor-conda
18+
-set PATH=%MINICONDA%;%MINICONDA%\Scripts;%MINICONDA%\Library\bin;%PATH%
1919

2020
install:
21-
-conda config --set always_yes yes --set changeps1 no
22-
-conda update -q conda
23-
-conda info -a
24-
-conda install mamba -c conda-forge
25-
-mamba install cmake pytest numpy pybind11 xtensor==0.24.0 -c conda-forge
26-
-"set PYTHONHOME=%MINICONDA%"
27-
-cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe -DDOWNLOAD_GTEST=ON .
28-
-nmake test_xtensor_python
29-
-nmake install
30-
-rmdir /s/q "test/googletest-src"
21+
-conda config --set always_yes yes --set changeps1 no
22+
-conda update -q conda
23+
-conda info -a
24+
-conda install mamba -c conda-forge
25+
-mamba install cmake pytest numpy pybind11 xtensor==0.24.0 -c conda-forge
26+
-set PYTHONHOME=%MINICONDA%
27+
-cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe -DDOWNLOAD_GTEST=ON .
28+
-nmake test_xtensor_python
29+
-nmake install
30+
-rmdir /s/q "test/googletest-src"
3131

3232
build_script:
33-
-py.test -s
34-
-cd test
35-
-.\test_xtensor_python
33+
-py.test -s
34+
-cd test
35+
-.\test_xtensor_python
Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
jobs:
2-
-job:'Linux_0'
3-
strategy:
4-
matrix:
5-
clang_6:
6-
llvm_version:'6.0'
7-
clang_7:
8-
llvm_version:'7'
9-
clang_8:
10-
llvm_version:'8'
11-
clang_9:
12-
llvm_version:'9'
13-
pool:
14-
vmImage:ubuntu-18.04
15-
variables:
16-
CC:clang-$(llvm_version)
17-
CXX:clang++-$(llvm_version)
18-
timeoutInMinutes:360
19-
steps:
2+
-job:Linux_0
3+
strategy:
4+
matrix:
5+
clang_6:
6+
llvm_version:'6.0'
7+
clang_7:
8+
llvm_version:'7'
9+
clang_8:
10+
llvm_version:'8'
11+
clang_9:
12+
llvm_version:'9'
13+
pool:
14+
vmImage:ubuntu-18.04
15+
variables:
16+
CC:clang-$(llvm_version)
17+
CXX:clang++-$(llvm_version)
18+
timeoutInMinutes:360
19+
steps:
2020

21-
-script:|
22-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
23-
if [[ $(llvm_version) == '4.0' || $(llvm_version) == '5.0' ]]; then
24-
sudo apt-get update
25-
sudo apt-get --no-install-suggests --no-install-recommends install gcc-4.9 clang-$(llvm_version)
26-
else
27-
LLVM_VERSION=$(llvm_version)
28-
get -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
29-
sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-$LLVM_VERSION main"
30-
sudo apt-get update
31-
sudo apt-get --no-install-suggests --no-install-recommends install clang-$(llvm_version)
32-
fi
33-
displayName: Install build toolchain
21+
-script:|
22+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
23+
if [[ $(llvm_version) == '4.0' || $(llvm_version) == '5.0' ]]; then
24+
sudo apt-get update
25+
sudo apt-get --no-install-suggests --no-install-recommends install gcc-4.9 clang-$(llvm_version)
26+
else
27+
LLVM_VERSION=$(llvm_version)
28+
get -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
29+
sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-$LLVM_VERSION main"
30+
sudo apt-get update
31+
sudo apt-get --no-install-suggests --no-install-recommends install clang-$(llvm_version)
32+
fi
33+
displayName: Install build toolchain
3434
35-
-bash:echo "##vso[task.prependpath]$CONDA/bin"
36-
displayName:Add conda to PATH
35+
-bash:echo "##vso[task.prependpath]$CONDA/bin"
36+
displayName:Add conda to PATH
3737

38-
-template:unix-build.yml
38+
-template:unix-build.yml
Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
jobs:
2-
-job:'Linux_1'
3-
strategy:
4-
matrix:
5-
gcc_6:
6-
gcc_version:'6'
7-
gcc_7:
8-
gcc_version:'7'
9-
gcc_8:
10-
gcc_version:'8'
11-
gcc_9:
12-
gcc_version:'9'
13-
pool:
14-
vmImage:ubuntu-18.04
15-
variables:
16-
CC:gcc-$(gcc_version)
17-
CXX:g++-$(gcc_version)
18-
timeoutInMinutes:360
19-
steps:
2+
-job:Linux_1
3+
strategy:
4+
matrix:
5+
gcc_6:
6+
gcc_version:'6'
7+
gcc_7:
8+
gcc_version:'7'
9+
gcc_8:
10+
gcc_version:'8'
11+
gcc_9:
12+
gcc_version:'9'
13+
pool:
14+
vmImage:ubuntu-18.04
15+
variables:
16+
CC:gcc-$(gcc_version)
17+
CXX:g++-$(gcc_version)
18+
timeoutInMinutes:360
19+
steps:
2020

21-
-script:|
22-
if [[ $(gcc_version) == '4.9' || $(gcc_version) == '6' || $(gcc_version) == '7' || $(gcc_version) == '8' ]]; then
23-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
24-
sudo apt-get update
25-
sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version)
26-
fi
27-
displayName: Install build toolchain
21+
-script:|
22+
if [[ $(gcc_version) == '4.9' || $(gcc_version) == '6' || $(gcc_version) == '7' || $(gcc_version) == '8' ]]; then
23+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
24+
sudo apt-get update
25+
sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version)
26+
fi
27+
displayName: Install build toolchain
2828
29-
-bash:echo "##vso[task.prependpath]$CONDA/bin"
30-
displayName:Add conda to PATH
31-
32-
-template:unix-build.yml
29+
-bash:echo "##vso[task.prependpath]$CONDA/bin"
30+
displayName:Add conda to PATH
3331

32+
-template:unix-build.yml
Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
jobs:
2-
-job:'OSX'
3-
strategy:
4-
matrix:
5-
macOS_10_15:
6-
image_name:'macOS-10.15'
7-
macOS_11:
8-
image_name:'macOS-11'
9-
pool:
10-
vmImage:$(image_name)
11-
variables:
12-
CC:clang
13-
CXX:clang++
14-
timeoutInMinutes:360
15-
steps:
16-
-script:|
17-
echo "Removing homebrew for Azure to avoid conflicts with conda"
18-
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
19-
chmod +x ~/uninstall_homebrew
20-
~/uninstall_homebrew -f -q
21-
displayName: Remove homebrew
2+
-job:OSX
3+
strategy:
4+
matrix:
5+
macOS_10_15:
6+
image_name:macOS-10.15
7+
macOS_11:
8+
image_name:macOS-11
9+
pool:
10+
vmImage:$(image_name)
11+
variables:
12+
CC:clang
13+
CXX:clang++
14+
timeoutInMinutes:360
15+
steps:
16+
-script:|
17+
echo "Removing homebrew for Azure to avoid conflicts with conda"
18+
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
19+
chmod +x ~/uninstall_homebrew
20+
~/uninstall_homebrew -f -q
21+
displayName: Remove homebrew
2222
23-
-bash:|
24-
echo "##vso[task.prependpath]$CONDA/bin"
25-
sudo chown -R $USER $CONDA
26-
displayName: Add conda to PATH
23+
-bash:|
24+
echo "##vso[task.prependpath]$CONDA/bin"
25+
sudo chown -R $USER $CONDA
26+
displayName: Add conda to PATH
2727
28-
-template:unix-build.yml
28+
-template:unix-build.yml

‎.azure-pipelines/unix-build.yml

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
steps:
2-
-script:|
3-
conda config --set always_yes yes --set changeps1 no
4-
conda update -q conda
5-
conda env create --file environment-dev.yml
6-
source activate xtensor-python
7-
displayName: Install dependencies
2+
-script:|
3+
conda config --set always_yes yes --set changeps1 no
4+
conda update -q conda
5+
conda env create --file environment-dev.yml
6+
source activate xtensor-python
7+
displayName:Install dependencies
88

9-
-script:|
10-
source activate xtensor-python
11-
mkdir build
12-
cd build
13-
cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DPYTHON_EXECUTABLE=`which python` -DDOWNLOAD_GTEST=ON $(Build.SourcesDirectory)
14-
make install
15-
displayName: Configure xtensor-python
16-
workingDirectory: $(Build.BinariesDirectory)
9+
-script:|
10+
source activate xtensor-python
11+
mkdir build
12+
cd build
13+
cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DPYTHON_EXECUTABLE=`which python` -DDOWNLOAD_GTEST=ON $(Build.SourcesDirectory)
14+
make install
15+
displayName:Configure xtensor-python
16+
workingDirectory:$(Build.BinariesDirectory)
1717

18-
-script:|
19-
source activate xtensor-python
20-
make -j2 test_xtensor_python
21-
displayName: Build xtensor-python
22-
workingDirectory: $(Build.BinariesDirectory)/build
18+
-script:|
19+
source activate xtensor-python
20+
make -j2 test_xtensor_python
21+
displayName:Build xtensor-python
22+
workingDirectory:$(Build.BinariesDirectory)/build
2323

24-
-script:|
25-
source activate xtensor-python
26-
cd test
27-
./test_xtensor_python
28-
displayName: Test xtensor-python (C++)
29-
workingDirectory: $(Build.BinariesDirectory)/build/test
24+
-script:|
25+
source activate xtensor-python
26+
cd test
27+
./test_xtensor_python
28+
displayName:Test xtensor-python (C++)
29+
workingDirectory:$(Build.BinariesDirectory)/build/test
3030

31-
-script:|
32-
source activate xtensor-python
33-
py.test -s
34-
displayName: Test xtensor-python (Python)
35-
workingDirectory: $(Build.SourcesDirectory)
31+
-script:|
32+
source activate xtensor-python
33+
py.test -s
34+
displayName:Test xtensor-python (Python)
35+
workingDirectory:$(Build.SourcesDirectory)
3636

37-
-script:|
38-
source activate xtensor-python
39-
cmake -Bbuild -DPython_EXECUTABLE=`which python`
40-
cd build
41-
cmake --build .
42-
cp ../example.py .
43-
python example.py
44-
cd ..
45-
displayName: Example - readme 1
46-
workingDirectory: $(Build.SourcesDirectory)/docs/source/examples/readme_example_1
37+
-script:|
38+
source activate xtensor-python
39+
cmake -Bbuild -DPython_EXECUTABLE=`which python`
40+
cd build
41+
cmake --build .
42+
cp ../example.py .
43+
python example.py
44+
cd ..
45+
displayName:Example - readme 1
46+
workingDirectory:$(Build.SourcesDirectory)/docs/source/examples/readme_example_1
4747

48-
-script:|
49-
source activate xtensor-python
50-
cmake -Bbuild -DPython_EXECUTABLE=`which python`
51-
cd build
52-
cmake --build .
53-
cp ../example.py .
54-
python example.py
55-
cd ..
56-
displayName: Example - Copy 'cast'
57-
workingDirectory: $(Build.SourcesDirectory)/docs/source/examples/copy_cast
48+
-script:|
49+
source activate xtensor-python
50+
cmake -Bbuild -DPython_EXECUTABLE=`which python`
51+
cd build
52+
cmake --build .
53+
cp ../example.py .
54+
python example.py
55+
cd ..
56+
displayName:Example - Copy 'cast'
57+
workingDirectory:$(Build.SourcesDirectory)/docs/source/examples/copy_cast
5858

59-
-script:|
60-
source activate xtensor-python
61-
cmake -Bbuild -DPython_EXECUTABLE=`which python`
62-
cd build
63-
cmake --build .
64-
cp ../example.py .
65-
python example.py
66-
cd ..
67-
displayName: Example - SFINAE
68-
workingDirectory: $(Build.SourcesDirectory)/docs/source/examples/sfinae
59+
-script:|
60+
source activate xtensor-python
61+
cmake -Bbuild -DPython_EXECUTABLE=`which python`
62+
cd build
63+
cmake --build .
64+
cp ../example.py .
65+
python example.py
66+
cd ..
67+
displayName:Example - SFINAE
68+
workingDirectory:$(Build.SourcesDirectory)/docs/source/examples/sfinae

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp