Skip to content
This repository was archived by the owner on Dec 30, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
f3e911a
visualition test(linux/macosx)
Sirokujira Oct 6, 2017
1d99c1b
addpath(vtk include/lib path)
Sirokujira Oct 6, 2017
3799288
add vtk path
Sirokujira Oct 6, 2017
1e222a2
vtk test
Sirokujira Oct 6, 2017
b7d4c8f
vtk test2
Sirokujira Oct 6, 2017
8dfa570
vtk test3
Sirokujira Oct 6, 2017
b561e49
vtk test4
Sirokujira Oct 6, 2017
c9f9820
vtk test5
Sirokujira Oct 6, 2017
8b5a582
vtk test6
Sirokujira Oct 6, 2017
d3d9ff7
test_files add
Sirokujira Oct 9, 2017
32f272f
testCI changed(use nose)
Sirokujira Oct 10, 2017
aa3ca22
test modified(filters)
Sirokujira Oct 10, 2017
6f1f26d
check code(rules pep8)
Sirokujira Oct 10, 2017
a5de49c
pxi comment add
Sirokujira Oct 13, 2017
396ad33
features test
Sirokujira Oct 26, 2017
0e72f46
modified
Sirokujira Oct 27, 2017
9b1f3a1
remove code(make_VFHEstimation function use NormalEstimation)
Sirokujira Oct 30, 2017
36e629d
feature test check
Sirokujira Oct 30, 2017
b7bde81
test modified
Sirokujira Oct 30, 2017
d215b35
module changed
Sirokujira Oct 30, 2017
e41a728
test modified
Sirokujira Oct 30, 2017
6d80f0d
test modified(sampleconsensus)
Sirokujira Nov 8, 2017
248b303
example modified
Sirokujira Nov 8, 2017
9206427
RandomSampleConsensus cinit modified
Sirokujira Nov 8, 2017
dadb103
add nose attr define
Sirokujira Nov 8, 2017
a94a9d9
add nosetests attr
Sirokujira Nov 8, 2017
367ff62
modified features(1.7)
Sirokujira Nov 8, 2017
0b0d1f1
add commentout module
Sirokujira Nov 8, 2017
630d543
modified IntegralImageNormalEstimation(160, 172)
Sirokujira Nov 8, 2017
a758143
modified test
Sirokujira Nov 8, 2017
58f2650
modified testCI yml
Sirokujira Nov 8, 2017
2fa6deb
modified define
Sirokujira Nov 8, 2017
5ffd691
testCI yml modified
Sirokujira Nov 9, 2017
7f97bfa
modified logic
Sirokujira Nov 9, 2017
42e40de
appveyor yml modified
Sirokujira Nov 9, 2017
2f20da7
test modified
Sirokujira Nov 9, 2017
44ab665
testCI modified
Sirokujira Nov 9, 2017
6028f34
test modified(HarrisKeyPoint3D)
Sirokujira Nov 9, 2017
64f0a5a
test modified(pcl 1.6 remove test ConditionalRemoval)
Sirokujira Nov 9, 2017
b89bab3
testCI modified(add clang)
Sirokujira Nov 10, 2017
e60c6c6
modified testCI yml
Sirokujira Nov 10, 2017
58f900c
pxi separate pcl version
Sirokujira Nov 10, 2017
6f37f86
modified
Sirokujira Nov 10, 2017
3989c0e
modified pxi file(utf-8,BOM off, CR+LF)
Sirokujira Nov 10, 2017
1dab8a9
modified pxi(SegmentationNormal)
Sirokujira Nov 10, 2017
790cdc7
modified Segmentation
Sirokujira Nov 10, 2017
7aeb182
modified testcode(autopep8)
Sirokujira Nov 10, 2017
dcd6ec8
modified pxi(SegmentationNormal)
Sirokujira Nov 10, 2017
d0cb02f
test modified
Sirokujira Nov 10, 2017
82bd3af
modified pxi(SegmentationNormal)
Sirokujira Nov 10, 2017
93e88af
delete no use files
Sirokujira Nov 10, 2017
20f9ede
testCI modified
Sirokujira Nov 10, 2017
778d36c
modified testCI
Sirokujira Nov 10, 2017
d2e67a0
modified pxi
Sirokujira Nov 10, 2017
92bb8b1
modified command option
Sirokujira Nov 10, 2017
e1b2baf
modified test case
Sirokujira Nov 10, 2017
cbe861e
travis ci modified
Sirokujira Nov 11, 2017
d44428d
linux clang test
Sirokujira Nov 11, 2017
c2e8388
modified testCI yml
Sirokujira Nov 13, 2017
a7b5421
modified document(Tutorial)
Sirokujira Nov 13, 2017
f36cd5d
document modified
Sirokujira Nov 13, 2017
1eb9a08
readme.rst modified
Sirokujira Nov 14, 2017
43e5506
document update
Sirokujira Nov 15, 2017
9da67e5
test modified(filepath)
Sirokujira Nov 16, 2017
ae55de4
docs Makefile modified
Sirokujira Nov 17, 2017
3f791b4
docs setting modified
Sirokujira Nov 17, 2017
eaf27e7
docs modified
Sirokujira Nov 17, 2017
a11c4ee
docs test
Sirokujira Nov 17, 2017
1401767
docs modified
Sirokujira Nov 17, 2017
a327e14
modified docs
Sirokujira Nov 17, 2017
5d6c510
modified documentation
Sirokujira Nov 20, 2017
d509245
docs modified(Add TestCode Path)
Sirokujira Nov 22, 2017
a6d7124
Appveyor modified(remove setpath python)
Sirokujira Nov 23, 2017
7444735
CI test(modified setpath)
Sirokujira Nov 23, 2017
a3b8984
TestCI modified(miniconda path changed)
Sirokujira Nov 23, 2017
6c35d4f
modified TestCI setting(appveyor.yml miss env path)
Sirokujira Nov 23, 2017
3a497ab
modified
Sirokujira Nov 24, 2017
a11adf5
add readthedocs.yml
Sirokujira Nov 28, 2017
ef16032
modified
Sirokujira Dec 6, 2017
75c81cf
Merge remote-tracking branch 'upstream/master' into master_docs
Sirokujira Dec 7, 2017
c1f4b7b
examples visualization use off, typo
Sirokujira Dec 7, 2017
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
137 changes: 134 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,108 @@ cache:
- pip
- ccache

# https://docs.travis-ci.com/user/languages/cpp/
matrix:
include:
# gcc
# - os: linux
# python: "2.7"
# env:
# - PCL_VERSION="1.7"
# - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
# - os: linux
# python: "3.4"
# env:
# - PCL_VERSION="1.7"
# - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
# - os: linux
# python: "3.5"
# env:
# - PCL_VERSION="1.7"
# - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
# gcc?
- os: linux
python: "2.7"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
env:
- PCL_VERSION="1.7"
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- os: linux
python: "3.4"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
env:
- PCL_VERSION="1.7"
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- os: linux
python: "3.5"
python: "3.5"#
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
env:
- PCL_VERSION="1.7"
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"

# clang
# apt-get no pcl use gcc
# - os: linux
# python: "2.7"
# env:
# - PCL_VERSION="1.7"
# - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
# addons:
# apt:
# sources:
# - ubuntu-toolchain-r-test
# - llvm-toolchain-precise-3.6
# packages:
# - clang-3.6
# env:
# - PCL_VERSION="1.7"
# - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
# - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
# - os: linux
# python: "3.4"
# addons:
# apt:
# sources:
# - ubuntu-toolchain-r-test
# - llvm-toolchain-precise-3.6
# packages:
# - clang-3.6
# env:
# - PCL_VERSION="1.7"
# - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
# - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
# - os: linux
# python: "3.5"
# addons:
# apt:
# sources:
# - ubuntu-toolchain-r-test
# - llvm-toolchain-precise-3.6
# packages:
# - clang-3.6
# env:
# - PCL_VERSION="1.7"
# - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
# - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"

# TravisCI TimeLimit 50min
# - os: linux
# python: "2.7"
Expand All @@ -37,24 +125,57 @@ matrix:
# - PCL_VERSION="1.8"

# TravisCI TimeLimit 50min
# gcc
- os: osx
language: generic
compiler: gcc
env:
- PYTHON_VERSION=2.7.10
- PYENV_ROOT=~/.pyenv
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
- NOSEATTR="not pcl_ver_0_4"
- os: osx
language: generic
compiler: gcc
env:
- PYTHON_VERSION=3.4.3
- PYENV_ROOT=~/.pyenv
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
- NOSEATTR="not pcl_ver_0_4"
- os: osx
language: generic
compiler: gcc
env:
- PYTHON_VERSION=3.5.1
- PYENV_ROOT=~/.pyenv
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
- NOSEATTR="not pcl_ver_0_4"
# clang
# homebrew pcl use gcc compiler
# - os: osx
# language: generic
# compiler: clang
# env:
# - PYTHON_VERSION=2.7.10
# - PYENV_ROOT=~/.pyenv
# - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
# - NOSEATTR="not pcl_ver_0_4"
# - os: osx
# language: generic
# compiler: clang
# env:
# - PYTHON_VERSION=3.4.3
# - PYENV_ROOT=~/.pyenv
# - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
# - NOSEATTR="not pcl_ver_0_4"
# - os: osx
# language: generic
# compiler: clang
# env:
# - PYTHON_VERSION=3.5.1
# - PYENV_ROOT=~/.pyenv
# - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
# - NOSEATTR="not pcl_ver_0_4"


# pcl 1.8.1 only(MacOSX/Ubuntu)
Expand All @@ -72,16 +193,21 @@ before_install:

travis_wait 45 brew install pcl --without-qt;

ls /usr/local/include;

cp -n ./travisCI/pcl_2d-1.8.pc /usr/local/lib/pkgconfig/pcl_2d-1.8.pc;
fi

# eval "${MATRIX_EVAL}";
install:
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.7" ) ]]; then
sudo apt-get install openni2-utils

sudo add-apt-repository ppa:v-launchpad-jochen-sprickerhof-de/pcl -y;
sudo apt-get update -y;
sudo apt-get install libpcl-all -y;

eval "${MATRIX_EVAL}";
fi
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.8" ) ]]; then
sudo add-apt-repository -y ppa:webupd8team/java && sudo apt update && sudo apt -y install oracle-java8-installer;
Expand Down Expand Up @@ -113,14 +239,19 @@ install:
fi
- pip install --upgrade pip
- pip install cython==0.25.2
- pip install nose
- pip install numpy
- pip install coveralls
- python setup.py build_ext -i
- python setup.py install

script:
- coverage run --parallel-mode tests/test_pcl.py
- coverage run --parallel-mode tests/test_registration.py
# - coverage run --parallel-mode tests/test_pcl.py
# - coverage run --parallel-mode tests/test_registration.py
# - nosetests -A "$NOSEATTR" --with-coverage --cover-erase --cover-package=python-pcl --verbose
# - nosetests -A "not pcl_ver_0_4 and not pcl_over_18" --with-coverage --cover-erase --cover-package=python-pcl --verbose
- nosetests -A "not pcl_ver_0_4 and not pcl_over_18" --verbose

# examples
# - python examples/GrabberCallbackTest.py
# examples/official
Expand Down
27 changes: 19 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ environment:
# See: http://stackoverflow.com/a/13751649/163740
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"

# https://www.appveyor.com/docs/build-environment/#miniconda
matrix:
- PYTHON: "C:\\Miniconda3-x64"
- PYTHON: "C:\\Miniconda34-x64"
PYTHON_VERSION: "3.4"
PYTHON_ARCH: "64"
PCL_ROOT: "C:\\Program Files\\PCL 1.6.0"
PCL_VERSION: "1.6"
OPENNI_VERSION: "1.3.2"
OPENNI_ROOT: "C:\\Program Files\\OpenNI\\Bin64"
APPVEYOR_OPENNI_ROOT: ".\\AppVeyor\\OpenNI\\x64\\Bin64"
NOSEATTR: "not pcl_ver_0_4 and not pcl_over_17 and not pcl_over_18"

- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
PYTHON: "C:\\Miniconda35-x64"
Expand All @@ -27,6 +29,7 @@ environment:
OPENNI_VERSION: "2.2"
OPENNI_ROOT: "C:\\Program Files\\OpenNI2\\Redist\\"
APPVEYOR_OPENNI_ROOT: ".\\AppVeyor\\OpenNI2\\x64\\Redist"
NOSEATTR: "not pcl_ver_0_4"

install:
# If there is a newer build queued for the same PR, cancel this one.
Expand All @@ -39,24 +42,31 @@ install:
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
throw "There are newer queued builds for this pull request, failing early." }

- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PYTHON%\\Lib\\site-packages;%PCL_ROOT%\\bin;%PCL_ROOT%\\3rdParty\\VTK\\bin;%OPENNI_ROOT%;%PATH%;"
- "pip install --disable-pip-version-check --user --upgrade pip"
# Python(set before conda command call)
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PYTHON%\\Lib\\site-packages;%PATH%;"

# Install the build dependencies of the project. If some dependencies contain
# compiled extensions and are not provided as pre-built wheel packages,
# pip will build them from source using the MSVC compiler matching the
# target Python version and architecture
# - "%CMD_IN_ENV% python -m pip install -r dev-requirements.txt"
# - "pip install wheel"
# - if [%PCL_VERSION%]==[1.6] anaconda search -t conda vc 10.*
# - if [%PCL_VERSION%]==[1.6] conda install -y -q anaconda-client
# - if [%PCL_VERSION%]==[1.6] SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PYTHON%\\Lib\\site-packages;%PATH%
- "conda install -y -q wheel"

# Mini-conda ng
# - "pip install --upgrade setuptools"
# - conda install -y -q setuptools
# use Visual Studio 2017?(over 34.4.0.)
# under 36.2.2
- conda install -y -q setuptools

# - "pip install --disable-pip-version-check --user --upgrade pip"

# PCL
- "SET PATH=%PCL_ROOT%\\bin;%PCL_ROOT%\\3rdParty\\VTK\\bin;%OPENNI_ROOT%;%PATH%;"

# PCL Install
- ps : appveyor\install.ps1

Expand Down Expand Up @@ -84,8 +94,9 @@ build_script:
- if [%PCL_VERSION%]==[1.6] copy "%APPVEYOR_OPENNI_ROOT%" "%PYTHON%\Lib\site-packages"

test_script:
- python tests\test_pcl.py
- python tests\test_registration.py
# - python tests\test_pcl.py
# - python tests\test_registration.py
- nosetests -A "%NOSEATTR%" --verbose

# - python examples\official\Filtering\PassThroughFilter.py
# - python examples\official\Filtering\project_inliers.py
Expand Down
3 changes: 3 additions & 0 deletions bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
python setup.py build_ext -i
python setup.py install
nosetests -A "not pcl_ver_0_4"
4 changes: 0 additions & 4 deletions build.bat

This file was deleted.

3 changes: 3 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
python setup.py build_ext -i
python setup.py install
nosetests
Loading