Skip to content
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

Cython eventseg #111

Merged
merged 11 commits into from Oct 3, 2016
Merged

Cython eventseg #111

merged 11 commits into from Oct 3, 2016

Conversation

@mjanderson09
Copy link
Contributor

@mjanderson09 mjanderson09 commented Sep 23, 2016

Added cython module for the _log function which speeds up examples/eventseg/simulated_data.py by 2.8X on my machine (Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz, Python 3.4.3 (default, Jan 26 2016, 02:25:35) [GCC 4.8.5 20150623 (Red Hat 4.8.5-4)] on linux)

time python3 simulated_data.py

Before:
real 0m10.687s
user 0m11.325s
sys 0m6.733s

After:
real 0m3.811s
user 0m4.466s
sys 0m6.722s

@yidawang
Copy link
Member

@yidawang yidawang commented Sep 23, 2016

Add the correspondingly compiled _utils.c file to .gitignore

@mihaic
Copy link
Contributor

@mihaic mihaic commented Sep 29, 2016

Jenkins, retest this please.

mihaic added 3 commits Sep 29, 2016
Also, simplify pybind11 include dirs usage and remove cython and
pybind11 from the install dependencies.
Travis tests fail otherwise.
Travis tests fail otherwise.
@mihaic
Copy link
Contributor

@mihaic mihaic commented Oct 3, 2016

@cbaldassano Could you please review this PR?

Copy link
Collaborator

@cbaldassano cbaldassano left a comment

Looks good to me, really impressed at how much of a difference this made!

mjanderson09 added 2 commits Oct 3, 2016
Add NumPy include dirs to setup
@mihaic
mihaic approved these changes Oct 3, 2016
@mihaic mihaic merged commit cf5d71b into brainiak:master Oct 3, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
linux Build finished.
Details
macos Build finished.
Details
@mjanderson09 mjanderson09 deleted the mjanderson09:cython_eventseg branch Apr 26, 2017
danielsuo pushed a commit that referenced this pull request Nov 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.