Skip to content

Commit 56638d2

Browse files
authored
TEST-modin-project#6477: Update ASV to 0.5.1 (modin-project#6432)
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
1 parent 37ab771 commit 56638d2

7 files changed

+5
-321
lines changed

.github/workflows/ci.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,7 @@ jobs:
234234
miniforge-version: latest
235235
use-mamba: true
236236
- name: ASV installation
237-
run: |
238-
# FIXME: use the tag or release version of ASV as soon as it appears;
239-
# The ability to build a conda environment by specifying yml file has not
240-
# yet appeared in the release versions;
241-
pip install git+https://github.com/airspeed-velocity/asv.git@ef016e233cb9a0b19d517135104f49e0a3c380e9
237+
run: pip install asv==0.5.1
242238
- name: Running benchmarks
243239
run: |
244240
git remote add upstream https://github.com/modin-project/modin.git
@@ -272,7 +268,7 @@ jobs:
272268
# TODO: Remove manual environment creation after fix https://github.com/airspeed-velocity/asv/issues/1310
273269
mamba env create -f ../requirements/env_hdk.yml
274270
conda activate modin_on_hdk
275-
pip install git+https://github.com/airspeed-velocity/asv.git@ef016e233cb9a0b19d517135104f49e0a3c380e9
271+
pip install asv==0.5.1
276272
pip install ..
277273
278274
# check Modin on HDK

asv_bench/asv.conf.dask.json

-104
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,9 @@
1313
// project being benchmarked
1414
"repo": "..",
1515

16-
// The Python project's subdirectory in your repo. If missing or
17-
// the empty string, the project is assumed to be located at the root
18-
// of the repository.
19-
// "repo_subdir": "",
20-
2116
// Customizable commands for building, installing, and
2217
// uninstalling the project. See asv.conf.json documentation.
23-
//
2418
"install_command": ["in-dir={env_dir} python -mpip install {wheel_file}[dask]"],
25-
// "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"],
26-
// "build_command": [
27-
// "python setup.py build",
28-
// "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"
29-
// ],
30-
31-
// List of branches to benchmark. If not provided, defaults to "master"
32-
// (for git) or "default" (for mercurial).
33-
// "branches": ["master"], // for git
34-
// "branches": ["default"], // for mercurial
35-
36-
// The DVCS being used. If not set, it will be automatically
37-
// determined from "repo" by looking at the protocol in the URL
38-
// (if remote), or by looking for special directories, such as
39-
// ".git" (if local).
40-
// "dvcs": "git",
4119

4220
// The tool to use to create environments. May be "conda",
4321
// "virtualenv" or other value depending on the plugins in use.
@@ -61,56 +39,6 @@
6139
// dependency packages in the specified order
6240
"conda_channels": ["conda-forge", "defaults"],
6341

64-
// The matrix of dependencies to test. Each key is the name of a
65-
// package (in PyPI) and the values are version numbers. An empty
66-
// list or empty string indicates to just test against the default
67-
// (latest) version. null indicates that the package is to not be
68-
// installed. If the package to be tested is only available from
69-
// PyPi, and the 'environment_type' is conda, then you can preface
70-
// the package name by 'pip+', and the package will be installed via
71-
// pip (with all the conda available packages installed first,
72-
// followed by the pip installed packages).
73-
// "matrix": {
74-
// "pip+ray": ["1.0.1"],
75-
// "pyarrow": ["1.0"]
76-
// },
77-
// Combinations of libraries/python versions can be excluded/included
78-
// from the set to test. Each entry is a dictionary containing additional
79-
// key-value pairs to include/exclude.
80-
//
81-
// An exclude entry excludes entries where all values match. The
82-
// values are regexps that should match the whole string.
83-
//
84-
// An include entry adds an environment. Only the packages listed
85-
// are installed. The 'python' key is required. The exclude rules
86-
// do not apply to includes.
87-
//
88-
// In addition to package names, the following keys are available:
89-
//
90-
// - python
91-
// Python version, as in the *pythons* variable above.
92-
// - environment_type
93-
// Environment type, as above.
94-
// - sys_platform
95-
// Platform, as in sys.platform. Possible values for the common
96-
// cases: 'linux2', 'win32', 'cygwin', 'darwin'.
97-
//
98-
// "exclude": [
99-
// {"python": "3.2", "sys_platform": "win32"}, // skip py3.2 on windows
100-
// {"environment_type": "conda", "six": null}, // don't run without six on conda
101-
// ],
102-
//
103-
// "include": [
104-
// // additional env for python2.7
105-
// {"python": "2.7", "numpy": "1.8"},
106-
// // additional env if run on windows+conda
107-
// {"platform": "win32", "environment_type": "conda", "python": "2.7", "libpython": ""},
108-
// ],
109-
110-
// The directory (relative to the current directory) that benchmarks are
111-
// stored in. If not provided, defaults to "benchmarks"
112-
// "benchmark_dir": "benchmarks",
113-
11442
// The directory (relative to the current directory) to cache the Python
11543
// environments in. If not provided, defaults to "env"
11644
"env_dir": ".asv/env",
@@ -122,36 +50,4 @@
12250
// The directory (relative to the current directory) that the html tree
12351
// should be written to. If not provided, defaults to "html".
12452
"html_dir": ".asv/html",
125-
126-
// The number of characters to retain in the commit hashes.
127-
// "hash_length": 8,
128-
129-
// `asv` will cache results of the recent builds in each
130-
// environment, making them faster to install next time. This is
131-
// the number of builds to keep, per environment.
132-
// "build_cache_size": 2,
133-
134-
// The commits after which the regression search in `asv publish`
135-
// should start looking for regressions. Dictionary whose keys are
136-
// regexps matching to benchmark names, and values corresponding to
137-
// the commit (exclusive) after which to start looking for
138-
// regressions. The default is to start from the first commit
139-
// with results. If the commit is `null`, regression detection is
140-
// skipped for the matching benchmark.
141-
//
142-
// "regressions_first_commits": {
143-
// "some_benchmark": "352cdf", // Consider regressions only after this commit
144-
// "another_benchmark": null, // Skip regression detection altogether
145-
// },
146-
147-
// The thresholds for relative change in results, after which `asv
148-
// publish` starts reporting regressions. Dictionary of the same
149-
// form as in ``regressions_first_commits``, with values
150-
// indicating the thresholds. If multiple entries match, the
151-
// maximum is taken. If no entry matches, the default is 5%.
152-
//
153-
// "regressions_thresholds": {
154-
// "some_benchmark": 0.01, // Threshold of 1%
155-
// "another_benchmark": 0.5, // Threshold of 50%
156-
// },
15753
}

asv_bench/asv.conf.json

-104
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,9 @@
1313
// project being benchmarked
1414
"repo": "..",
1515

16-
// The Python project's subdirectory in your repo. If missing or
17-
// the empty string, the project is assumed to be located at the root
18-
// of the repository.
19-
// "repo_subdir": "",
20-
2116
// Customizable commands for building, installing, and
2217
// uninstalling the project. See asv.conf.json documentation.
23-
//
2418
"install_command": ["in-dir={env_dir} python -mpip install {wheel_file}[ray]"],
25-
// "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"],
26-
// "build_command": [
27-
// "python setup.py build",
28-
// "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"
29-
// ],
30-
31-
// List of branches to benchmark. If not provided, defaults to "master"
32-
// (for git) or "default" (for mercurial).
33-
// "branches": ["master"], // for git
34-
// "branches": ["default"], // for mercurial
35-
36-
// The DVCS being used. If not set, it will be automatically
37-
// determined from "repo" by looking at the protocol in the URL
38-
// (if remote), or by looking for special directories, such as
39-
// ".git" (if local).
40-
// "dvcs": "git",
4119

4220
// The tool to use to create environments. May be "conda",
4321
// "virtualenv" or other value depending on the plugins in use.
@@ -61,56 +39,6 @@
6139
// dependency packages in the specified order
6240
"conda_channels": ["conda-forge", "defaults"],
6341

64-
// The matrix of dependencies to test. Each key is the name of a
65-
// package (in PyPI) and the values are version numbers. An empty
66-
// list or empty string indicates to just test against the default
67-
// (latest) version. null indicates that the package is to not be
68-
// installed. If the package to be tested is only available from
69-
// PyPi, and the 'environment_type' is conda, then you can preface
70-
// the package name by 'pip+', and the package will be installed via
71-
// pip (with all the conda available packages installed first,
72-
// followed by the pip installed packages).
73-
// "matrix": {
74-
// "pip+ray": ["1.0.1"],
75-
// "pyarrow": ["1.0"]
76-
// },
77-
// Combinations of libraries/python versions can be excluded/included
78-
// from the set to test. Each entry is a dictionary containing additional
79-
// key-value pairs to include/exclude.
80-
//
81-
// An exclude entry excludes entries where all values match. The
82-
// values are regexps that should match the whole string.
83-
//
84-
// An include entry adds an environment. Only the packages listed
85-
// are installed. The 'python' key is required. The exclude rules
86-
// do not apply to includes.
87-
//
88-
// In addition to package names, the following keys are available:
89-
//
90-
// - python
91-
// Python version, as in the *pythons* variable above.
92-
// - environment_type
93-
// Environment type, as above.
94-
// - sys_platform
95-
// Platform, as in sys.platform. Possible values for the common
96-
// cases: 'linux2', 'win32', 'cygwin', 'darwin'.
97-
//
98-
// "exclude": [
99-
// {"python": "3.2", "sys_platform": "win32"}, // skip py3.2 on windows
100-
// {"environment_type": "conda", "six": null}, // don't run without six on conda
101-
// ],
102-
//
103-
// "include": [
104-
// // additional env for python2.7
105-
// {"python": "2.7", "numpy": "1.8"},
106-
// // additional env if run on windows+conda
107-
// {"platform": "win32", "environment_type": "conda", "python": "2.7", "libpython": ""},
108-
// ],
109-
110-
// The directory (relative to the current directory) that benchmarks are
111-
// stored in. If not provided, defaults to "benchmarks"
112-
// "benchmark_dir": "benchmarks",
113-
11442
// The directory (relative to the current directory) to cache the Python
11543
// environments in. If not provided, defaults to "env"
11644
"env_dir": ".asv/env",
@@ -122,36 +50,4 @@
12250
// The directory (relative to the current directory) that the html tree
12351
// should be written to. If not provided, defaults to "html".
12452
"html_dir": ".asv/html",
125-
126-
// The number of characters to retain in the commit hashes.
127-
// "hash_length": 8,
128-
129-
// `asv` will cache results of the recent builds in each
130-
// environment, making them faster to install next time. This is
131-
// the number of builds to keep, per environment.
132-
// "build_cache_size": 2,
133-
134-
// The commits after which the regression search in `asv publish`
135-
// should start looking for regressions. Dictionary whose keys are
136-
// regexps matching to benchmark names, and values corresponding to
137-
// the commit (exclusive) after which to start looking for
138-
// regressions. The default is to start from the first commit
139-
// with results. If the commit is `null`, regression detection is
140-
// skipped for the matching benchmark.
141-
//
142-
// "regressions_first_commits": {
143-
// "some_benchmark": "352cdf", // Consider regressions only after this commit
144-
// "another_benchmark": null, // Skip regression detection altogether
145-
// },
146-
147-
// The thresholds for relative change in results, after which `asv
148-
// publish` starts reporting regressions. Dictionary of the same
149-
// form as in ``regressions_first_commits``, with values
150-
// indicating the thresholds. If multiple entries match, the
151-
// maximum is taken. If no entry matches, the default is 5%.
152-
//
153-
// "regressions_thresholds": {
154-
// "some_benchmark": 0.01, // Threshold of 1%
155-
// "another_benchmark": 0.5, // Threshold of 50%
156-
// },
15753
}

asv_bench/asv.conf.unidist.json

-104
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,9 @@
1313
// project being benchmarked
1414
"repo": "..",
1515

16-
// The Python project's subdirectory in your repo. If missing or
17-
// the empty string, the project is assumed to be located at the root
18-
// of the repository.
19-
// "repo_subdir": "",
20-
2116
// Customizable commands for building, installing, and
2217
// uninstalling the project. See asv.conf.json documentation.
23-
//
2418
"install_command": ["in-dir={env_dir} python -mpip install {wheel_file}[unidist]"],
25-
// "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"],
26-
// "build_command": [
27-
// "python setup.py build",
28-
// "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"
29-
// ],
30-
31-
// List of branches to benchmark. If not provided, defaults to "master"
32-
// (for git) or "default" (for mercurial).
33-
// "branches": ["master"], // for git
34-
// "branches": ["default"], // for mercurial
35-
36-
// The DVCS being used. If not set, it will be automatically
37-
// determined from "repo" by looking at the protocol in the URL
38-
// (if remote), or by looking for special directories, such as
39-
// ".git" (if local).
40-
// "dvcs": "git",
4119

4220
// The tool to use to create environments. May be "conda",
4321
// "virtualenv" or other value depending on the plugins in use.
@@ -61,56 +39,6 @@
6139
// dependency packages in the specified order
6240
"conda_channels": ["conda-forge", "defaults"],
6341

64-
// The matrix of dependencies to test. Each key is the name of a
65-
// package (in PyPI) and the values are version numbers. An empty
66-
// list or empty string indicates to just test against the default
67-
// (latest) version. null indicates that the package is to not be
68-
// installed. If the package to be tested is only available from
69-
// PyPi, and the 'environment_type' is conda, then you can preface
70-
// the package name by 'pip+', and the package will be installed via
71-
// pip (with all the conda available packages installed first,
72-
// followed by the pip installed packages).
73-
// "matrix": {
74-
// "pip+ray": ["1.0.1"],
75-
// "pyarrow": ["1.0"]
76-
// },
77-
// Combinations of libraries/python versions can be excluded/included
78-
// from the set to test. Each entry is a dictionary containing additional
79-
// key-value pairs to include/exclude.
80-
//
81-
// An exclude entry excludes entries where all values match. The
82-
// values are regexps that should match the whole string.
83-
//
84-
// An include entry adds an environment. Only the packages listed
85-
// are installed. The 'python' key is required. The exclude rules
86-
// do not apply to includes.
87-
//
88-
// In addition to package names, the following keys are available:
89-
//
90-
// - python
91-
// Python version, as in the *pythons* variable above.
92-
// - environment_type
93-
// Environment type, as above.
94-
// - sys_platform
95-
// Platform, as in sys.platform. Possible values for the common
96-
// cases: 'linux2', 'win32', 'cygwin', 'darwin'.
97-
//
98-
// "exclude": [
99-
// {"python": "3.2", "sys_platform": "win32"}, // skip py3.2 on windows
100-
// {"environment_type": "conda", "six": null}, // don't run without six on conda
101-
// ],
102-
//
103-
// "include": [
104-
// // additional env for python2.7
105-
// {"python": "2.7", "numpy": "1.8"},
106-
// // additional env if run on windows+conda
107-
// {"platform": "win32", "environment_type": "conda", "python": "2.7", "libpython": ""},
108-
// ],
109-
110-
// The directory (relative to the current directory) that benchmarks are
111-
// stored in. If not provided, defaults to "benchmarks"
112-
// "benchmark_dir": "benchmarks",
113-
11442
// The directory (relative to the current directory) to cache the Python
11543
// environments in. If not provided, defaults to "env"
11644
"env_dir": ".asv/env",
@@ -122,36 +50,4 @@
12250
// The directory (relative to the current directory) that the html tree
12351
// should be written to. If not provided, defaults to "html".
12452
"html_dir": ".asv/html",
125-
126-
// The number of characters to retain in the commit hashes.
127-
// "hash_length": 8,
128-
129-
// `asv` will cache results of the recent builds in each
130-
// environment, making them faster to install next time. This is
131-
// the number of builds to keep, per environment.
132-
// "build_cache_size": 2,
133-
134-
// The commits after which the regression search in `asv publish`
135-
// should start looking for regressions. Dictionary whose keys are
136-
// regexps matching to benchmark names, and values corresponding to
137-
// the commit (exclusive) after which to start looking for
138-
// regressions. The default is to start from the first commit
139-
// with results. If the commit is `null`, regression detection is
140-
// skipped for the matching benchmark.
141-
//
142-
// "regressions_first_commits": {
143-
// "some_benchmark": "352cdf", // Consider regressions only after this commit
144-
// "another_benchmark": null, // Skip regression detection altogether
145-
// },
146-
147-
// The thresholds for relative change in results, after which `asv
148-
// publish` starts reporting regressions. Dictionary of the same
149-
// form as in ``regressions_first_commits``, with values
150-
// indicating the thresholds. If multiple entries match, the
151-
// maximum is taken. If no entry matches, the default is 5%.
152-
//
153-
// "regressions_thresholds": {
154-
// "some_benchmark": 0.01, // Threshold of 1%
155-
// "another_benchmark": 0.5, // Threshold of 50%
156-
// },
15753
}

0 commit comments

Comments
 (0)