Skip to content

Commit c24e94c

Browse files
committed
Check python if system already equipped one
1 parent 5c0178b commit c24e94c

File tree

7 files changed

+236
-212
lines changed

7 files changed

+236
-212
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ addons:
2121
packages:
2222
- gcc-4.8
2323
- g++-4.8
24-
- wget
2524
- git
2625
- build-essential
2726
- libatlas-base-dev
2827
- python
2928
- python-pip
3029
- python2.7-dev
30+
- python-numpy
31+
- python-wheel
3132
- curl
3233
- swig
3334
- graphviz
@@ -48,8 +49,7 @@ before_install:
4849
fi
4950
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then paddle/scripts/travis/before_install.osx.sh; fi
5051
- if [[ "$JOB" == "PRE_COMMIT" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
51-
- pip install --upgrade pip
52-
- pip install wheel protobuf sphinx recommonmark sphinx_rtd_theme virtualenv pre-commit requests==2.9.2 LinkChecker
52+
- pip install numpy wheel protobuf sphinx recommonmark sphinx_rtd_theme virtualenv pre-commit requests==2.9.2 LinkChecker
5353
script:
5454
- paddle/scripts/travis/main.sh
5555
notifications:

cmake/configure.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
if(NOT WITH_PYTHON)
16+
add_definitions(-DPADDLE_NO_PYTHON)
17+
endif(NOT WITH_PYTHON)
18+
1519
if(WITH_DSO)
1620
add_definitions(-DPADDLE_USE_DSO)
1721
endif(WITH_DSO)

0 commit comments

Comments
 (0)