Skip to content

issue 878 partial fix #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
36 changes: 27 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
# Runtime artifacts
/build
*.eggs/
*.pyc
/src/_compress.c
/tmp/
*.pyc
*.egg
*.so
*.egg-info
*.sw[op]
.cache

# Coverage
htmlcov
# Coverage test artifacts
/.run/
htmlcov/
.coverage
.idea
.cache
coverage.xml
junit.xml
/tmp/

*.sw[op]
# PyCharm IDE
/.idea/

# Virtual Environments
/.tox/
/.venv/

# Install Artifacts
*.eggs/
*.egg-info/

# Benchmark Artifacts
/asv/
/.asv/

# Setup Scripts
get-pip.py
setpath.sh
clean_after_tox.sh
Empty file added .gitmodules
Empty file.
73 changes: 64 additions & 9 deletions asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

// The URL or local path of the source code repository for the
// project being benchmarked
"repo": "https://github.com/manahl/arctic",
"repo": ".",

// List of branches to benchmark. If not provided, defaults to "master"
// (for git) or "tip" (for mercurial).
Expand All @@ -31,17 +31,27 @@
// variable.
"environment_type": "virtualenv",

// timeout in seconds for installing any dependencies in environment
// defaults to 10 min
//"install_timeout": 600,

// the base URL to show a commit for the project.
"show_commit_url": "http://github.com/manahl/arctic/commit/",

// The Pythons you'd like to test against. If not provided, defaults
// to the current version of Python used to run `asv`.
"pythons": ["2.7"],
"pythons": ["2.7", "3.6", "3.7"],

// The matrix of dependencies to test. Each key is the name of a
// package (in PyPI) and the values are version numbers. An empty
// list indicates to just test against the default (latest)
// version.
// list or empty string indicates to just test against the default
// (latest) version. null indicates that the package is to not be
// installed. If the package to be tested is only available from
// PyPi, and the 'environment_type' is conda, then you can preface
// the package name by 'pip+', and the package will be installed via
// pip (with all the conda available packages installed first,
// followed by the pip installed packages).
//
"matrix": {
"numpy": [],
"Cython": [],
Expand All @@ -56,28 +66,73 @@
"tzlocal": []
},

// Combinations of libraries/python versions can be excluded/included
// from the set to test. Each entry is a dictionary containing additional
// key-value pairs to include/exclude.
//
// An exclude entry excludes entries where all values match. The
// values are regexps that should match the whole string.
//
// An include entry adds an environment. Only the packages listed
// are installed. The 'python' key is required. The exclude rules
// do not apply to includes.
//
// In addition to package names, the following keys are available:
//
// - python
// Python version, as in the *pythons* variable above.
// - environment_type
// Environment type, as above.
// - sys_platform
// Platform, as in sys.platform. Possible values for the common
// cases: 'linux2', 'win32', 'cygwin', 'darwin'.
//
// "exclude": [
// {"python": "3.2", "sys_platform": "win32"}, // skip py3.2 on windows
// {"environment_type": "conda", "six": null}, // don't run without six on conda
// ],
//
// "include": [
// // additional env for python2.7
// {"python": "2.7", "numpy": "1.8"},
// // additional env if run on windows+conda
// {"platform": "win32", "environment_type": "conda", "python": "2.7", "libpython": ""},
// ],

// The directory (relative to the current directory) that benchmarks are
// stored in. If not provided, defaults to "benchmarks"
"benchmark_dir": "benchmarks",

// The directory (relative to the current directory) to cache the Python
// environments in. If not provided, defaults to "env"
// "env_dir": "env",

"env_dir": ".asv/env",

// The directory (relative to the current directory) that raw benchmark
// results are stored in. If not provided, defaults to "results".
// "results_dir": "results",
"results_dir": ".asv/results",

// The directory (relative to the current directory) that the html tree
// should be written to. If not provided, defaults to "html".
// "html_dir": "html",
"html_dir": ".asv/html",

// The number of characters to retain in the commit hashes.
// "hash_length": 8,

// `asv` will cache wheels of the recent builds in each
// environment, making them faster to install next time. This is
// number of builds to keep, per environment.
// "wheel_cache_size": 0
// "build_cache_size": 0

// The commits after which the regression search in `asv publish`
// should start looking for regressions. Dictionary whose keys are
// regexps matching to benchmark names, and values corresponding to
// the commit (exclusive) after which to start looking for
// regressions. The default is to start from the first commit
// with results. If the commit is `null`, regression detection is
// skipped for the matching benchmark.
//
// "regressions_first_commits": {
// "some_benchmark": "352cdf", // Consider regressions only after this commit
// "another_benchmark": null, // Skip regression detection altogether
// }
}
8 changes: 7 additions & 1 deletion benchmarks.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Arctic Benchmarks

Benchmarks are located in the [benchmarks/](benchmarks/) directory. You must install [ASV](https://github.com/spacetelescope/asv/) to run the benchmarks. It can be installed with pip, or cloned from github and built locally (this is preferred). A config file is provided as well [asv.conf.json](asv.conf.json). To run the benchmarks, simply run 'asv run'. More information on ASV is provided in their [documentation](http://asv.readthedocs.org/en/latest/using.html).
Benchmarks are located in the [benchmarks/](benchmarks/) directory. You must
install [ASV](https://github.com/spacetelescope/asv/) to run the benchmarks.
It can be installed with pip, or cloned from github and built locally (this
is preferred). A config file is provided as well [asv.conf.json](asv.conf.json).
To run the benchmarks, simply run 'asv run'. More information on ASV is
provided in their [documentation](http://asv.readthedocs.org/en/latest/using.html).

5 changes: 5 additions & 0 deletions benchmarks/fast_serializable_check.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import time

# FIXME: CM#013 - (asv unable to import tests module - add arctic proj root to path)
import os.path
import sys
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import arctic.serialization.numpy_records as anr
from tests.unit.serialization.serialization_test_data import _mixed_test_data as input_test_data

Expand Down
Loading