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

Commitbe43aeb

Browse files
authored
Merge branch 'main' into enh/faster-string-sorting
2 parents83dc94f +b1656d2 commitbe43aeb

File tree

536 files changed

+5754
-3449
lines changed

Some content is hidden

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

536 files changed

+5754
-3449
lines changed

‎.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# Initializes the CodeQL tools for scanning.
4949
-name:Initialize CodeQL
50-
uses:github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b# v3.28.17
50+
uses:github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f# v3.28.18
5151
with:
5252
languages:${{ matrix.language }}
5353
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
5757
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5858
# If this step fails, then you should remove it and run the build manually (see below)
5959
-name:Autobuild
60-
uses:github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b# v3.28.17
60+
uses:github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f# v3.28.18
6161

6262
# ℹ️ Command-line programs to run using the OS shell.
6363
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,6 +70,6 @@ jobs:
7070
# ./location_of_script_within_repo/buildscript.sh
7171

7272
-name:Perform CodeQL Analysis
73-
uses:github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b# v3.28.17
73+
uses:github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f# v3.28.18
7474
with:
7575
category:"/language:${{matrix.language}}"

‎.github/workflows/linux_simd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
python -m pip install pytest pytest-xdist hypothesis typing_extensions
213213
214214
-name:Build
215-
run:CC=gcc-13 CXX=g++-13 spin build -- -Dallow-noblas=true -Dcpu-baseline=avx512_skx -Dtest-simd='BASELINE,AVX512_KNL,AVX512_KNM,AVX512_SKX,AVX512_CLX,AVX512_CNL,AVX512_ICL,AVX512_SPR'
215+
run:CC=gcc-13 CXX=g++-13 spin build -- -Denable-openmp=true -Dallow-noblas=true -Dcpu-baseline=avx512_skx -Dtest-simd='BASELINE,AVX512_KNL,AVX512_KNM,AVX512_SKX,AVX512_CLX,AVX512_CNL,AVX512_ICL,AVX512_SPR'
216216

217217
-name:Meson Log
218218
if:always()
@@ -263,7 +263,7 @@ jobs:
263263
python -m pip install pytest pytest-xdist hypothesis typing_extensions
264264
265265
-name:Build
266-
run:CC=gcc-13 CXX=g++-13 spin build -- -Dallow-noblas=true -Dcpu-baseline=avx512_spr
266+
run:CC=gcc-13 CXX=g++-13 spin build -- -Denable-openmp=true -Dallow-noblas=true -Dcpu-baseline=avx512_spr
267267

268268
-name:Meson Log
269269
if:always()

‎.github/workflows/macos.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
build_runner:
116116
-[ macos-13, "macos_x86_64" ]
117117
-[ macos-14, "macos_arm64" ]
118-
version:["3.11", "3.14t"]
118+
version:["3.11", "3.14t-dev"]
119119

120120
steps:
121121
-uses:actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683# v4.2.2
@@ -124,14 +124,9 @@ jobs:
124124
fetch-tags:true
125125
persist-credentials:false
126126

127-
-uses:astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca
127+
-uses:actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065# v5.6.0
128128
with:
129-
activate-environment:true
130129
python-version:${{ matrix.version }}
131-
enable-cache:false
132-
133-
-run:
134-
uv pip install --python=${{ matrix.version }} pip
135130

136131
-uses:maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd# v1.6.0
137132
if:${{ matrix.build_runner[0] == 'macos-13' }}

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ jobs:
5050

5151
# Upload the results to GitHub's code scanning dashboard.
5252
-name:"Upload to code-scanning"
53-
uses:github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b# v2.1.27
53+
uses:github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f# v2.1.27
5454
with:
5555
sarif_file:results.sarif

‎.github/workflows/windows.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
compiler-pyversion:
2626
-["MSVC", "3.11"]
27-
-["Clang-cl", "3.14t"]
27+
-["Clang-cl", "3.14t-dev"]
2828

2929
steps:
3030
-name:Checkout
@@ -35,14 +35,9 @@ jobs:
3535
persist-credentials:false
3636

3737
-name:Setup Python
38-
uses:astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca
38+
-uses:actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065# v5.6.0
3939
with:
40-
activate-environment:true
4140
python-version:${{ matrix.compiler-pyversion[1] }}
42-
enable-cache:false
43-
44-
-run:
45-
uv pip install --python=${{ matrix.version }} pip
4641

4742
-name:Install build dependencies from PyPI
4843
run:|

‎.spin/cmds.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
importimportlib
12
importos
23
importpathlib
3-
importimportlib
44
importshutil
55
importsubprocess
66
importsys
@@ -48,8 +48,8 @@ def changelog(token, revision_range):
4848
$ spin authors -t $GH_TOKEN --revision-range v1.25.0..v1.26.0
4949
"""
5050
try:
51-
fromgithub.GithubExceptionimportGithubException
5251
fromgit.excimportGitError
52+
fromgithub.GithubExceptionimportGithubException
5353
changelog=_get_numpy_tools(pathlib.Path('changelog.py'))
5454
exceptModuleNotFoundErrorase:
5555
raiseclick.ClickException(
@@ -263,6 +263,7 @@ def _set_mem_rlimit(max_mem=None):
263263
Set address space rlimit
264264
"""
265265
importresource
266+
266267
importpsutil
267268

268269
mem=psutil.virtual_memory()

‎benchmarks/asv_pip_nopep517.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""
44
importsubprocess
55
importsys
6+
67
# pip ignores '--global-option' when pep517 is enabled therefore we disable it.
78
cmd= [sys.executable,'-mpip','wheel','--no-use-pep517']
89
try:

‎benchmarks/benchmarks/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
from .importcommon
2-
importsys
31
importos
2+
importsys
3+
4+
from .importcommon
5+
46

57
defshow_cpu_features():
68
fromnumpy.lib._utils_implimport_opt_info

‎benchmarks/benchmarks/bench_app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classLaplaceInplace(Benchmark):
77
params= ['inplace','normal']

‎benchmarks/benchmarks/bench_array_coercion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classArrayCoercionSmall(Benchmark):
77
# More detailed benchmarks for array coercion,

‎benchmarks/benchmarks/bench_clip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classClipFloat(Benchmark):
77
param_names= ["dtype","size"]

‎benchmarks/benchmarks/bench_core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classCore(Benchmark):
77
defsetup(self):

‎benchmarks/benchmarks/bench_creation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark,TYPES1,get_squares_
2-
31
importnumpyasnp
42

3+
from .commonimportTYPES1,Benchmark,get_squares_
4+
55

66
classMeshGrid(Benchmark):
77
""" Benchmark meshgrid generation

‎benchmarks/benchmarks/bench_function_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55
try:
66
# SkipNotImplemented is available since 6.0
77
fromasv_runner.benchmarks.markimportSkipNotImplemented

‎benchmarks/benchmarks/bench_indexing.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
from .commonimport (
2-
Benchmark,get_square_,get_indexes_,get_indexes_rand_,TYPES1)
3-
4-
fromos.pathimportjoinaspjoin
51
importshutil
6-
fromnumpyimportmemmap,float32,array
7-
importnumpyasnp
2+
fromos.pathimportjoinaspjoin
83
fromtempfileimportmkdtemp
94

5+
importnumpyasnp
6+
fromnumpyimportarray,float32,memmap
7+
8+
from .commonimportTYPES1,Benchmark,get_indexes_,get_indexes_rand_,get_square_
9+
1010

1111
classIndexing(Benchmark):
1212
params= [TYPES1+ ["object","O,i"],

‎benchmarks/benchmarks/bench_io.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
from.commonimportBenchmark,get_squares,get_squares_
1+
fromioimportSEEK_SET,BytesIO,StringIO
22

33
importnumpyasnp
4-
fromioimportSEEK_SET,StringIO,BytesIO
4+
5+
from .commonimportBenchmark,get_squares,get_squares_
56

67

78
classCopy(Benchmark):

‎benchmarks/benchmarks/bench_itemselection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark,TYPES1
2-
31
importnumpyasnp
42

3+
from .commonimportTYPES1,Benchmark
4+
55

66
classTake(Benchmark):
77
params= [

‎benchmarks/benchmarks/bench_lib.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"""Benchmarks for `numpy.lib`."""
22

33

4-
from .commonimportBenchmark
5-
64
importnumpyasnp
75

6+
from .commonimportBenchmark
7+
88

99
classPad(Benchmark):
1010
"""Benchmarks for `numpy.pad`.

‎benchmarks/benchmarks/bench_linalg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark,get_squares_,get_indexes_rand,TYPES1
2-
31
importnumpyasnp
42

3+
from .commonimportTYPES1,Benchmark,get_indexes_rand,get_squares_
4+
55

66
classEindot(Benchmark):
77
defsetup(self):

‎benchmarks/benchmarks/bench_ma.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classMA(Benchmark):
77
defsetup(self):

‎benchmarks/benchmarks/bench_manipulate.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
from.commonimportBenchmark,TYPES1
1+
fromcollectionsimportdeque
22

33
importnumpyasnp
4-
fromcollectionsimportdeque
4+
5+
from .commonimportTYPES1,Benchmark
6+
57

68
classBroadcastArrays(Benchmark):
79
params= [[(16,32), (128,256), (512,1024)],

‎benchmarks/benchmarks/bench_polynomial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classPolynomial(Benchmark):
77

‎benchmarks/benchmarks/bench_random.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55
try:
66
fromnumpy.randomimportGenerator
77
exceptImportError:

‎benchmarks/benchmarks/bench_records.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classRecords(Benchmark):
77
defsetup(self):

‎benchmarks/benchmarks/bench_reduce.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark,TYPES1,get_squares
2-
31
importnumpyasnp
42

3+
from .commonimportTYPES1,Benchmark,get_squares
4+
55

66
classAddReduce(Benchmark):
77
defsetup(self):

‎benchmarks/benchmarks/bench_scalar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark,TYPES1
2-
31
importnumpyasnp
42

3+
from .commonimportTYPES1,Benchmark
4+
55

66
classScalarMath(Benchmark):
77
# Test scalar math, note that each of these is run repeatedly to offset

‎benchmarks/benchmarks/bench_shape_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55

66
classBlock(Benchmark):
77
params= [1,10,100]

‎benchmarks/benchmarks/bench_strings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from .commonimportBenchmark
1+
importoperator
22

33
importnumpyasnp
4-
importoperator
54

5+
from .commonimportBenchmark
66

77
_OPERATORS= {
88
'==':operator.eq,

‎benchmarks/benchmarks/bench_trim_zeros.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark
4+
55
_FLOAT=np.dtype('float64')
66
_COMPLEX=np.dtype('complex128')
77
_INT=np.dtype('int64')

‎benchmarks/benchmarks/bench_ufunc.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
from .commonimportBenchmark,get_squares_,TYPES1,DLPACK_TYPES
2-
3-
importnumpyasnp
41
importitertools
5-
frompackagingimportversion
62
importoperator
73

4+
frompackagingimportversion
5+
6+
importnumpyasnp
7+
8+
from .commonimportDLPACK_TYPES,TYPES1,Benchmark,get_squares_
89

910
ufuncs= ['abs','absolute','add','arccos','arccosh','arcsin','arcsinh',
1011
'arctan','arctan2','arctanh','bitwise_and','bitwise_count','bitwise_not',

‎benchmarks/benchmarks/bench_ufunc_strides.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from .commonimportBenchmark,get_data
2-
31
importnumpyasnp
42

3+
from .commonimportBenchmark,get_data
4+
55
UFUNCS= [objforobjinnp._core.umath.__dict__.values()if
66
isinstance(obj,np.ufunc)]
77
UFUNCS_UNARY= [ufforufinUFUNCSif"O->O"inuf.types]

0 commit comments

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