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.

Sign up for GitHub

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

[Ctypes] TVB-2719 Use ctypes instead of cython #40

Open
wants to merge 12 commits into
base: trunk
Choose a base branch
from
+542 −802
Open

[Ctypes] TVB-2719 Use ctypes instead of cython #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d1b0254
Commit C source
ayan-b Jun 10, 2020
965339f
macOS & Linux done
ayan-b Jul 2, 2020
eb45128
Use ctypes instead of cython
ayan-b Jun 23, 2020
52d996b
Free memory
ayan-b Jun 24, 2020
a050841
Put generated file inside build
ayan-b Jun 24, 2020
a56de8f
Lint fixes
ayan-b Jun 24, 2020
51e28b5
Test equality with stable version
ayan-b Jul 1, 2020
085c469
Remove excess macOS job
ayan-b Jul 2, 2020
1479a22
Use pytest again
ayan-b Jul 7, 2020
4ca35c4
Back to nose2
ayan-b Jul 7, 2020
e677b68
Fix merge conflict
ayan-b Jul 14, 2020
120c1b5
Fix merge conflicts
ayan-b Jul 14, 2020
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ __pycache__/

# Distribution / packaging
dist/
*.egg-info
build/

# coverage file
.coverage
Expand All @@ -26,7 +28,10 @@ env
# Executables
*.out
*.exe
*.o

# Shared object files
*.so
*.pyd
*.dylib
*.dll
24 changes: 16 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,36 @@ notifications:

install:
- pip3 install .
# - python setup.py build_ext --inplace
script:
- pip3 install pytest~=3.6.1
- pytest
- pip3 install nose2 nose2-cov
- nose2 --with-coverage
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have a preference to keep using pytest, for consistency with the other TVB builds.
Anyway, nose does not solve the seg fault issue.

Copy link
Member Author

@ayan-b ayan-b Jul 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure but it appears to be a pytest issue.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why you say it is pytest?
the build are still failing, and tests are not really execute in the latest Travis run.... am I missing something?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enthought/comtypes#204 I got this same error. The current failures are due to something else. I am still investigating and will report you back if nose actually fixes the issue.


jobs:
include:
- name: "Python 3.8 on Xenial Linux"
language: python
python: 3.8
before_install:
- pip3 install codecov
- sudo chmod +x linux_so.sh
- ./linux_so.sh
after_success: codecov
- name: "Python 3.7.4 on macOS"
os: osx
osx_image: xcode11.2
language: shell
before_install:
- chmod 755 macos_dylib.sh
- ./macos_dylib.sh
- name: "Python 3.8.0 on Windows"
os: windows
language: shell
before_install:
- choco install python --version 3.8.0
- python -m pip install --upgrade pip
- python -m pip install -U pip
- pip install --user wheel
- ./create_dll.bat
env: PATH=/c/Python38:/c/Python38/Scripts:$PATH
- name: "Python 3.7.4 on macOS"
os: osx
osx_image: xcode11.2
language: shell
- stage: lint
language: python
python: 3.8
Expand Down
224 changes: 0 additions & 224 deletions alternative_geodesic.py
View file
Open in desktop

This file was deleted.

47 changes: 47 additions & 0 deletions create_dll.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
echo on

if NOT DEFINED VCINSTALLDIR (
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
echo "USING VISUAL STUDIO 17"
)
)

if NOT DEFINED VCINSTALLDIR (
if exist "C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" amd64
echo "USING VISUAL STUDIO 15"
)
)

if NOT DEFINED VCINSTALLDIR (
if exist "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
echo "USING VISUAL STUDIO 14"
)
)

if NOT DEFINED VCINSTALLDIR (
if exist "C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" amd64
echo "USING VISUAL STUDIO 13"
)
)

if NOT DEFINED VCINSTALLDIR (
if exist "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
echo "USING VISUAL STUDIO 12"
)
)

if NOT DEFINED VCINSTALLDIR (
echo "No compatible visual studio found! run vcvarsall.bat first!"
)

mkdir build\lib.win32

cd build\lib.win32

cl.exe /LD /DDLL_EXPORTS /EHsc ..\..\geodesic_library\gdist_c_api.cpp
ls
Loading