Skip to content

Commit aa4dec0

Browse files
tailsutailsu
committed
Merge remote-tracking branch 'origin/master' into dm/fix-m_strides_computed
2 parents d836da3 + 41be223 commit aa4dec0

Some content is hidden

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

58 files changed

+1922
-386
lines changed

‎.azure-pipelines/azure-pipelines-linux-gcc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242

4343
- script: |
44-
if [[ $(gcc_version) == '4.9' || $(gcc_version) == '6' ]]; then
44+
if [[ $(gcc_version) == '4.9' || $(gcc_version) == '6' || $(gcc_version) == '7' || $(gcc_version) == '8' ]]; then
4545
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
4646
sudo apt-get update
4747
sudo apt-get --no-install-suggests --no-install-recommends install g++-$(gcc_version)

‎.github/workflows/gh-pages.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: gh-pages
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
10+
publish:
11+
12+
runs-on: ubuntu-latest
13+
14+
defaults:
15+
run:
16+
shell: bash -l {0}
17+
18+
steps:
19+
20+
- name: Basic GitHub action setup
21+
uses: actions/checkout@v2
22+
23+
- name: Set conda environment "test"
24+
uses: conda-incubator/setup-miniconda@v2
25+
with:
26+
mamba-version: "*"
27+
channels: conda-forge,defaults
28+
channel-priority: true
29+
environment-file: docs/environment.yaml
30+
activate-environment: test
31+
auto-activate-base: false
32+
33+
- name: Run doxygen
34+
working-directory: docs
35+
run: doxygen
36+
37+
- name: Deploy to GitHub Pages
38+
if: success()
39+
uses: crazy-max/ghaction-github-pages@v2
40+
with:
41+
target_branch: gh-pages
42+
build_dir: docs/html
43+
jekyll: false
44+
keep_history: false
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Doxygen output
2+
docs/html/
3+
docs/xml/
4+
15
# Prerequisites
26
*.d
37

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ set(XTENSOR_HEADERS
124124
${XTENSOR_INCLUDE_DIR}/xtensor/xbuffer_adaptor.hpp
125125
${XTENSOR_INCLUDE_DIR}/xtensor/xbuilder.hpp
126126
${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_array.hpp
127+
${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_assign.hpp
128+
${XTENSOR_INCLUDE_DIR}/xtensor/xchunked_view.hpp
127129
${XTENSOR_INCLUDE_DIR}/xtensor/xcomplex.hpp
128130
${XTENSOR_INCLUDE_DIR}/xtensor/xcontainer.hpp
129131
${XTENSOR_INCLUDE_DIR}/xtensor/xcsv.hpp

‎README.md‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
[![Azure](https://dev.azure.com/xtensor-stack/xtensor-stack/_apis/build/status/xtensor-stack.xtensor?branchName=master)](https://dev.azure.com/xtensor-stack/xtensor-stack/_build/latest?definitionId=4&branchName=master)
55
[![Coverity](https://scan.coverity.com/projects/18335/badge.svg)](https://scan.coverity.com/projects/xtensor)
66
[![Documentation](http://readthedocs.org/projects/xtensor/badge/?version=latest)](https://xtensor.readthedocs.io/en/latest/?badge=latest)
7+
[![Doxygen -> gh-pages](https://github.com/xtensor-stack/xtensor/workflows/gh-pages/badge.svg)](https://xtensor-stack.github.io/xtensor)
78
[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/xtensor-stack/xtensor/stable?filepath=notebooks%2Fxtensor.ipynb)
89
[![Join the Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/QuantStack/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
910

@@ -41,20 +42,10 @@ compilers are supported:
4142

4243
### Package managers
4344

44-
If you are using Conan to manage your dependencies, merely add `xtensor/x.y.z@omaralvarez/public-conan` to your requires, where x.y.z is the release version you want to use. Please file issues in [conan-xtensor](https://github.com/omaralvarez/conan-xtensor) if you experience problems with the packages. Sample `conanfile.txt`:
45-
46-
```
47-
[requires]
48-
xtensor/0.20.8@omaralvarez/public-conan
49-
50-
[generators]
51-
cmake
52-
```
53-
54-
We also provide a package for the conda package manager:
45+
We provide a package for the mamba (or conda) package manager:
5546

5647
```bash
57-
conda install -c conda-forge xtensor
48+
mamba install -c conda-forge xtensor
5849
```
5950

6051
### Install from sources
@@ -93,20 +84,17 @@ library:
9384
| `xtensor` | `xtl` |`xsimd` (optional) |
9485
|-----------|---------|-------------------|
9586
| master | ^0.7.0 | ^7.4.8 |
87+
| 0.23.9 | ^0.7.0 | ^7.4.8 |
88+
| 0.23.8 | ^0.7.0 | ^7.4.8 |
89+
| 0.23.7 | ^0.7.0 | ^7.4.8 |
90+
| 0.23.6 | ^0.7.0 | ^7.4.8 |
91+
| 0.23.5 | ^0.7.0 | ^7.4.8 |
92+
| 0.23.4 | ^0.7.0 | ^7.4.8 |
93+
| 0.23.3 | ^0.7.0 | ^7.4.8 |
94+
| 0.23.2 | ^0.7.0 | ^7.4.8 |
9695
| 0.23.1 | ^0.7.0 | ^7.4.8 |
9796
| 0.23.0 | ^0.7.0 | ^7.4.8 |
9897
| 0.22.0 | ^0.6.23 | ^7.4.8 |
99-
| 0.21.10 | ^0.6.21 | ^7.4.8 |
100-
| 0.21.9 | ^0.6.21 | ^7.4.8 |
101-
| 0.21.8 | ^0.6.20 | ^7.4.8 |
102-
| 0.21.7 | ^0.6.18 | ^7.4.8 |
103-
| 0.21.6 | ^0.6.18 | ^7.4.8 |
104-
| 0.21.5 | ^0.6.12 | ^7.4.6 |
105-
| 0.21.4 | ^0.6.12 | ^7.4.6 |
106-
| 0.21.3 | ^0.6.9 | ^7.4.4 |
107-
| 0.21.2 | ^0.6.9 | ^7.4.4 |
108-
| 0.21.1 | ^0.6.9 | ^7.4.2 |
109-
| 0.21.0 | ^0.6.9 | ^7.4.2 |
11098

11199
The dependency on `xsimd` is required if you want to enable SIMD acceleration
112100
in `xtensor`. This can be done by defining the macro `XTENSOR_USE_XSIMD`

‎cmake/FindTBB.cmake‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,12 @@ if(NOT TBB_FOUND)
184184
##################################
185185

186186
if(TBB_INCLUDE_DIRS)
187-
file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file)
187+
if(EXISTS "${TBB_INCLUDE_DIRS}/tbb/version.h")
188+
# since version 2021.1
189+
file(READ "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h" _tbb_version_file)
190+
else()
191+
file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file)
192+
endif()
188193
string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
189194
TBB_VERSION_MAJOR "${_tbb_version_file}")
190195
string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"
@@ -300,4 +305,4 @@ if(NOT TBB_FOUND)
300305
unset(TBB_LIB_PATH_SUFFIX)
301306
unset(TBB_DEFAULT_SEARCH_DIR)
302307

303-
endif()
308+
endif()

‎docs/Doxyfile‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
PROJECT_NAME = "xtensor"
2-
XML_OUTPUT = xml
3-
INPUT = missing_macro.hpp ../include
4-
GENERATE_LATEX = NO
5-
GENERATE_MAN = NO
6-
GENERATE_RTF = NO
7-
CASE_SENSE_NAMES = NO
8-
GENERATE_HTML = NO
9-
GENERATE_XML = YES
10-
RECURSIVE = YES
11-
QUIET = YES
1+
PROJECT_NAME = "xtensor"
2+
XML_OUTPUT = xml
3+
INPUT = missing_macro.hpp ../include
4+
GENERATE_LATEX = NO
5+
GENERATE_MAN = NO
6+
GENERATE_RTF = NO
7+
CASE_SENSE_NAMES = NO
8+
GENERATE_HTML = YES
9+
GENERATE_XML = YES
10+
RECURSIVE = YES
11+
QUIET = YES
1212
JAVADOC_AUTOBRIEF = YES
1313
WARN_IF_UNDOCUMENTED = NO
1414
MACRO_EXPANSION = YES
1515
PREDEFINED = IN_DOXYGEN
16+
EXCLUDE_SYMBOLS = detail
17+
GENERATE_TREEVIEW = YES
18+
SOURCE_BROWSER = YES
19+
# WARN_IF_UNDOCUMENTED = YES
20+
21+
# Allow for rst directives and advanced functions e.g. grid tables
22+
ALIASES = "rst=\verbatim embed:rst:leading-asterisk"
23+
ALIASES += "endrst=\endverbatim"

‎docs/environment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
channels:
2+
- conda-forge
3+
dependencies:
4+
- doxygen

‎docs/source/api/nan_functions.rst‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,30 @@ Defined in ``xtensor/xmath.hpp``
1515
.. doxygenfunction:: nan_to_num(E&&)
1616
:project: xtensor
1717

18+
.. _nanmin-function-reference:
19+
.. doxygenfunction:: nanmin(E&&, X&&, EVS)
20+
:project: xtensor
21+
22+
.. _nanmax-function-reference:
23+
.. doxygenfunction:: nanmax(E&&, X&&, EVS)
24+
:project: xtensor
25+
1826
.. _nansum-function-reference:
1927
.. doxygenfunction:: nansum(E&&, X&&, EVS)
2028
:project: xtensor
2129

30+
.. _nanmean-function-reference:
31+
.. doxygenfunction:: nanmean(E&&, X&&, EVS)
32+
:project: xtensor
33+
34+
.. _nanvar-function-reference:
35+
.. doxygenfunction:: nanvar(E&&, X&&, EVS)
36+
:project: xtensor
37+
38+
.. _nanstd-function-reference:
39+
.. doxygenfunction:: nanstd(E&&, X&&, EVS)
40+
:project: xtensor
41+
2242
.. _nanprod-function-reference:
2343
.. doxygenfunction:: nanprod(E&&, X&&, EVS)
2444
:project: xtensor

‎docs/source/api/xhistogram.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ Further overloads
3636
.. doxygenfunction:: xt::histogram(E1&&, std::size_t, bool)
3737
:project: xtensor
3838

39+
.. doxygenfunction:: xt::histogram(E1&&, std::size_t, E2, E2, bool)
40+
:project: xtensor
41+
3942
.. doxygenfunction:: xt::histogram(E1&&, std::size_t, E2&&, bool)
4043
:project: xtensor
4144

45+
.. doxygenfunction:: xt::histogram(E1&&, std::size_t, E2&&, E3, E3, bool)
46+
:project: xtensor
47+
4248
.. doxygenfunction:: xt::histogram_bin_edges(E1&&, E2, E2, std::size_t, histogram_algorithm)
4349
:project: xtensor
4450

0 commit comments

Comments
 (0)