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

Jump to bottom

fix some nvcc compile options #392

Merged
merged 1 commit into from
Nov 8, 2016
Merged

fix some nvcc compile options #392

merged 1 commit into from
Nov 8, 2016
+17 −10

Conversation

hedaoyuan
Copy link
Contributor

fix #282

@reyoung reyoung added the Bug label Nov 8, 2016
@reyoung reyoung added this to the 0.9.0 milestone Nov 8, 2016
@reyoung reyoung self-assigned this Nov 8, 2016
gangliao
gangliao reviewed Nov 8, 2016
View reviewed changes
CMakeLists.txt
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-g -O3 --use_fast_math")

if(WITH_AVX)
if(AVX_FOUND)
Copy link
Contributor

Choose a reason for hiding this comment

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

跟132行组合在一起吧

Copy link
Contributor

Choose a reason for hiding this comment

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

WITH_AVX和AVX_FOUND是一个意思，用WITH_AVX就行了。参考132行

Copy link
Contributor Author

Choose a reason for hiding this comment

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

放132里面一样要用到WITH_GPU，这个TODO(yuyang18):.对这段Code也有用。

Copy link
Contributor

Choose a reason for hiding this comment

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

@gangliao WITH_AVX 和 AVX_FOUND其实不能对等，AVX_FOUND只是WITH_AVX一个默认值而已。
我说说我的观点：
一般， 是否编译AVX版本应该与用户编译机是否带AVX_FOUND无关，在没有AVX指令集的机器上编译AVX版本也是可以的（只要编译器支持），所以我个人觉得AVX_FOUND（代表了编译机的特性）应该只能出现定义WITH_AVX 前面，且只能起到对WITH_AVX的默认值设置（方便用户在无avx机器上能够默认编译无avx指令的paddle）。我们现在的用法中，在WITH _AVX 定义后面继续引用AVX_FOUND，让整个逻辑比较复杂，不够直观。

Copy link
Contributor

Choose a reason for hiding this comment

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

明白了 我理一下

Copy link
Contributor

@backyes backyes Nov 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

@gangliao @hedaoyuan @reyoung 我们整体这块逻辑可能有改进空间，不止AVX，还有很多其他feature也使用了这种用法。

gangliao
gangliao requested changes Nov 8, 2016
View reviewed changes
CMakeLists.txt
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-g -O3 --use_fast_math")

if(WITH_AVX)
if(AVX_FOUND)
Copy link
Contributor

Choose a reason for hiding this comment

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

WITH_AVX和AVX_FOUND是一个意思，用WITH_AVX就行了。参考132行

@gangliao gangliao merged commit 125c19a into PaddlePaddle:develop Nov 8, 2016
@backyes
Copy link
Contributor

backyes commented Nov 8, 2016

@gangliao @hedaoyuan We need to test it to make sure the performance GAP are removed between GPU and CPU version.
@linrongyi Can you help to test this patch and post performance result, thanks.

@linrongyi
Copy link

@backyes 我测试了一下, 修复nvcc编译参数以后, CPU训练的速度符合预期, 和WITH_GPU=OFF 编译出来的paddle的性能一致.

@backyes backyes mentioned this pull request Nov 9, 2016
Merged
@gangliao
Copy link
Contributor

gangliao commented Nov 9, 2016

#404

sanylcs added a commit to sanylcs/Paddle that referenced this pull request Dec 21, 2016
@sanylcs
Master (#1)
eb530f7 
* refine sparse momentum api and unittest (PaddlePaddle#126)

* refine sparse momentum api and unittest
* fix unittests bug

* Remove main function in some unittest.

* Update Mac OS X port
* follow comments to fix bugs

* Revise some word in build doc

* Add automatic check AVX in CMake (PaddlePaddle#145)

* Add automatic check AVX in CMake
* Revise table format and some words in build docs

* Fix cmake/FindAVX.cmake

* Update build docs (PaddlePaddle#148)

* Add automatic check AVX in CMake

* Add indent in FindAVX.cmake

* Revise table format and some words in build docs

* Update build docs

* Fix bug when only support AVX 2 (PaddlePaddle#150)

In some situation, for instance, in the virtual machine, it could happen.

* add scripts to build ubuntu install package. (PaddlePaddle#132)

* also refine install docs, too

* some bug fix for sparse matrix (PaddlePaddle#133)

* some bug fix for sparse matrix

* a minor bug fix

* Update build docs (PaddlePaddle#149)

* Add automatic check AVX in CMake

* Add indent in FindAVX.cmake

* Revise table format and some words in build docs

* Update build docs

* Update build docs

* [DOC CHANGE] Rerange Build docs & emphasize them in README.md (PaddlePaddle#151)

* Rerange Build docs & emphasize them in README.md

* Rerange Build docs & emphasize them in README.md

* Update Readme (PaddlePaddle#153)

* Update Readme

* Update readme

* Update readme

* Fix  CUDA_VERSION Comparsion (PaddlePaddle#165)

* Update readme (PaddlePaddle#155)

* Update readme

* Apache 2.0

* add interface and test of RecurrentGradientMachine (PaddlePaddle#156)

* add interface and unittest of RecurrentGradientMachine for the function of multiple Subsequence inlinks with unequal token length

* bug fix for dataprovider for quick start inference (PaddlePaddle#168)

* Support MAC OS Sierra (PaddlePaddle#169)

* typo in image classification demo (PaddlePaddle#167)

* support rectangle padding, stride, window and input for PoolProjection (PaddlePaddle#115)

* support rectangle padding, stride, window and input for PoolProjection

* Follow comments.
1. Remove start
2. refine img_pool_a/b.conf for test_NetworkCompare
3. Split unit test

* Modify the test in img_layers.py

* Use C++ 11 atomic_flag in MacOS as spin lock (PaddlePaddle#175)

* Use C++ 11 atomic_flag in MacOS as spin lock
* Add unittest for it.

* Read git sha1 when building Paddle, and add it to PADDLE_VERSION macro

* save the model file including git sha1

* add weight for cost layer interface (PaddlePaddle#177)

* Should not compile the two files if -DWITH_AVX=OFF. (PaddlePaddle#163)

* If cmake -DWITH_AVX=OFF during configuration, should not compile the file src/hl_math.cc and src/hl_avx_functions.cc.

* Add travis for osx (PaddlePaddle#189)

* set MKL search path with intel64 (PaddlePaddle#188)

* Mnist demo (PaddlePaddle#162)

* added mnist demo

* modified .gitignore for .project files

* normalize pixel in mnist_provider.py and set use_gpu=0

* add interface and unittest for nce layer (PaddlePaddle#180)

* add interface and unittest for nce layer

* follow comments

* Merge internal changes (PaddlePaddle#198)

* fix DataProvider create function args bug

Change-Id: I9e3a1c535c805bf30204a14aea8d5143ff534784

* remove PserverForPython.h which is not used

Change-Id: I2b27f1f3c11a42766a92fc689f0f5f1f73ee1d70

* add internal document script

Change-Id: Ia0fec79456caea0b271f9903cc13e8a3d32e0774

* hierarchical rnn document, add new config example (PaddlePaddle#106)

* hierarchical rnn document, add new config example

* update inputs_type of label

* add check for unsupported config

* refine hierarchical document

* refine doc title

* update docs, fix paddle to PaddlePaddle

* follow comments

* remove some copyfrom in AgentLayer and ExpandLayer, fix warning in seq2seq config (PaddlePaddle#183)

* remove redundant HPPL_TYPE_DOUBLE (PaddlePaddle#200)

* add cost_type constraint to weighted_cost interface (PaddlePaddle#206)

* remove unmerged internal documents (PaddlePaddle#205)

* Add FAQ (PaddlePaddle#128)

* Init commit for doing FAQ

* Add speed up training

* Add graphviz to ci

* Add shared paramter

* Tiny refine

* Fix bug in yield dictionary in DataProvider. (PaddlePaddle#197)

* Fix bug in yield dictionary in DataProvider.
* Also make virtualenv work in Paddle.

* Update docker_instll.rst docker image name (PaddlePaddle#210)

* Fix sparse training for trainer_count=1 (PaddlePaddle#204)

* Fix sparse training for trainer_count=1

For trainer_count=1, the gradient machine is NeuralNetwork, which does not create parameter buf for PARAMETER_GRADIENT for sparse update in Parameter::enableType. But gradient parameter buf is still used in SgdThreadUpdater.

* Minor update to comment

* Supplement doc for RNN (PaddlePaddle#214)

* Speed up PyDP2, support numpy.float array (PaddlePaddle#207)

* fix bug in some different python environment (PaddlePaddle#220)

* Fix install_docker.rst and data_sources file open mode

* Follow PaddlePaddle#223
* Fix PaddlePaddle#222

* add base class for seqlastin/max/average layer (PaddlePaddle#187)

* Added Bidi-LSTM and DB-LSTM to quick_start demo (PaddlePaddle#226)

* add missing layer_attr (PaddlePaddle#234)

* fix build bug in gcc46 (PaddlePaddle#236)

* error in doc of quick_start (PaddlePaddle#228)

* fix error in doc of quick_start
* There are some warning when execute preprocess.sh

* add maxout layer, including interface and unittest (PaddlePaddle#229)

* add maxout layer, including interface and unittest

* follow maxout comments

* auto setting channels

* fix unittest bug in test_RecurrentGradientMachine

* remove deprecated start input in img_pool_layer (PaddlePaddle#237)

* Fix dataprovider converter for sparse data

* FIx check type unmatch in MaxOutLayer (PaddlePaddle#242)

Compiled failed on gcc 4.6

* Sequence tagging demo (PaddlePaddle#225)

* Update contribute_to_paddle.md (PaddlePaddle#248)

* add input sparse data check for sparse layer at runtime (PaddlePaddle#247)

* add input sparse data check for sparse layer at runtime,
to avoid invalid data access at pserver end while doing prefetch

* remote sparse design support binary sparse and float saprse both

* Python trainer api (PaddlePaddle#193)

* Python trainer API and demo

* Adding missing PaddleAPIPrivate.h

* Adding api_train.sh

* More comments

* Bump up patch version to 0b3

* Change contribute to paddle to fit new branching model (PaddlePaddle#275)

* Change contribute to paddle to fit new branching model

* set test_period default value to 0 (PaddlePaddle#279)

* Make Paddle --save_dir support a directory name  (PaddlePaddle#277)

* Also fix PaddlePaddle#243

* fix interface bug of block_expand_layer and add unittest (PaddlePaddle#265)

* fix interface bug of block_expand_layer and add unittest

* auto compute num_channels

* default value of num_channels is None

* adjust input order of block_expand

* Support empty Param Block in ParameterSever (PaddlePaddle#244)

* Because in cluster maybe use a lot machine to train a model, and some parameter size could be too small for ParameterServer. Then some of pservers could not have any ParamBlock.
* Also, because ports_num or ports_num_for_sparse is too large, then give a warning in runtime.

* Add bilinear interpolation layer

* fix type unmatch on gcc

* Adding an introduction doc for Paddle to implement simplest linear regression.

* Add default cuda system path (PaddlePaddle#192)

* DYLD_LIBRARY_PATH is disable after Mac OS X 10.11
* fix clang + gpu compile error on Mac OS
* fix some words and errors in build docs

* Add glog header path to include (PaddlePaddle#295)

* add SpatialPyramidPoolLayer c++ support

* Add job=time in trainer, refine cudnn_conv to reduce gpu memory and speed up training. (PaddlePaddle#218)

* Add benchmark for PaddlePaddle, tensorflow and caffe

* ConvProjection to reduce memory for goolenet

* Add unit test for ConvProjection.
1. unit test in test_LayerGrad.
2. compare the ConvPorjection and CudnnConvLayer, also compare the concat_layer+img_conv_layer and concat_layer_conv_projection.

* Reduce cudnn_conv memory and add benchmark document.
1. Use TmpMatrix as the workspace in cudnn_conv to reduce gpu memory. It reduce lots of memory.
2. Add benchmark document.
3. fix smallnet_mnist_cifar.py in paddle.

* Add job=time and refine cudnn_conv to reduce gpu memroy and speed up

* Refine cudnn_conv and shared biases operation in concat_layer and mixed_layer.

* follow comments

* follow comments

* Use unique_ptr to prevent memory leaks in CudnnConvLayer.

* Add some concepts documents to guide user for using paddle (PaddlePaddle#249)

* reuse code of PoolProjection in PoolProjectionLayer

* Add How to build docs (PaddlePaddle#312)

* Bug fix in CudnnConvLayer, which will lead to destruction error. (PaddlePaddle#317)

* Fix a bug in testOnePeriod. (PaddlePaddle#322)

* Forget to finishTestPeriod in testOnePeriod.
* Fix PaddlePaddle#318

* add user_arg to LayerConfig (PaddlePaddle#315)

* install the right python package version (PaddlePaddle#326)

For multiple installation of paddle, there might be multiple versions of python package at opt/paddle/share/wheels/. We should install the right version.
Ideally, we should remove the wrong versions when install. But it's not easy to do this with cmake.

Change-Id: Ida8a8d60643ad9e42cf1c85776de9122d5ba1392

* Add matrix inverse (PaddlePaddle#240)

* Add matrix inverse

* report error when use parallel_nn to train recurrent_nn model (PaddlePaddle#335)

* install the right python package version (PaddlePaddle#340)

For multiple installation of paddle, there might be multiple versions of python package at opt/paddle/share/wheels/. We should install the right version.
Ideally, we should remove the wrong versions when install. But it's not easy to do this with cmake.

Change-Id: Ida8a8d60643ad9e42cf1c85776de9122d5ba1392

* Fix minor errors in instructions of building Paddle on Mac OS X (PaddlePaddle#347)

* Fix bug and redundant code in hl_dso_loader.cc (PaddlePaddle#306)

* Fix glog check type unmatch in Util.cpp (PaddlePaddle#353)

* Fix glog check type unmatch in Util.cpp

PaddlePaddle#352

* Add code coverage and coveralls (PaddlePaddle#296)

* Add Issue template to guide user submit good issue (PaddlePaddle#354)

* Add issue template

* Update ISSUE_TEMPLATE.md

* Update ISSUE_TEMPLATE.md

* Rename

* Rename

* Typo

* Typo

* Typo

* Typo

* Follow comments

* Follow comments

* Add elementwise math operations (PaddlePaddle#343)

* Add elementwise math operations
This allows use to use expressions like: y=log(1+exp(x))
Also added unittests for ActivationFunction
* Enforce keyword arguments for non-positional arguments
* Add LogActivation to doc

* include mkl_lapacke.h (PaddlePaddle#359)

* Update ISSUE_TEMPLATE.md (PaddlePaddle#357)

* add rdma cmake support (PaddlePaddle#284)

* add rdma cmake support

* move rdma related code to rdma.cmake

* using find_package for swig (PaddlePaddle#334)

* Use diff to compare config unittest (PaddlePaddle#363)

Fix PaddlePaddle#342

* Fix SRL hang when exit. (PaddlePaddle#291)

* Fix SRL hang when exit.

* Error occurred when enable Async Load in TestDataProvider.
  * It because DataProvider is calling getNextBatchInternal in one thread, and destructing DataProvider in other thread.
  * Add wait routine in DataProvider destructing.
* Also fix another bug, when destructing TestDataProvider and do not read any test data.

Fix PaddlePaddle#286

* Follow comments, Use mutex is cool!

* Follow comments

* Add img_size for unit test

* Fix bilinear interp bug

* revert flags.cmake

* Replace outputH to batchSize

* Follow comments

* Revise one word in ISSUE_TEMPLATE.md (PaddlePaddle#371)

* abstract outputSize function in CNN-related layers (PaddlePaddle#314)

* Add define for double getrf, getri (PaddlePaddle#381)

* Add SumCost

This allows user to implement any type of cost by summing over the output of non-cost layers.

Change-Id: Ic55aaabbf0c1299e70b8e48a0effcc91f8f5bd29

* Add sum_cost to document

And rebase

Change-Id: I7ea234b3aa8fc70675af15d91db08242c43fb5ff

* Remove Mac OS X build docs (PaddlePaddle#386)

Currently, Paddle on Mac OS X is not deliberate testing through the different versions of  Mac OS X and Clang.
When all these things that we've done, we will reopen Mac build docs.

* add python wrap for sppLayer

* Cancelling Travis build with docs updates only. (PaddlePaddle#372)

* fix deadlink in Chinese quick start doc. (PaddlePaddle#389)

* add python-related unittest problem in faq document (PaddlePaddle#377)

* Fix macOS quick start preprocess script. (PaddlePaddle#390)

* Use `gshuf` instead of `shuf` in macOS
* Fix PaddlePaddle#388

* fix floating-point overflow problem of tanh (PaddlePaddle#355)

* py_paddle link zlib(PaddlePaddle#393)

* enable swig unittest in travis-ci (PaddlePaddle#394)

* Init

* Add numpy deps

* Refine

* fix some nvcc compile options (PaddlePaddle#392)

* Follow comments

* modify the format of diff information in protostr (PaddlePaddle#398)

* Fix minior bug
* add patch does not trigger travis ci

* follow comments

* Fix Travis Ci does not build when push patches (PaddlePaddle#399)

* add getSize method for PoolProjection

* Make matrix well-conditioned when unittest inverse

* Implement setDiag() with BaseMatrix::assign()

* Follow comments

* follow comments

* Update FindAVX.cmake (PaddlePaddle#404)

* make AVX_FOUND is default value to WITH AVX
* let AVX_FLAG always keep -mavx flag since compiler can build binary with -mavx even CPU does not support avx.

* some tiny fixs (PaddlePaddle#406)

* some tiny fixs

* use VLOG(3)

* [Work in Progress] Update cluster_train.md (PaddlePaddle#391)

Update cluster_train.md for easier understanding

* Fix memory leak in image classification demo, which is caused by dataprovider (PaddlePaddle#323)

* the memory leak is inside one pass.

* Update

* Delelte old protostr

* Follow comments

* add some code comments for SppLayer

* Update

* Fix a bug

* initial take on deconv layers

* added convTrans test and python components

* added more test on convTrans layer and comments

* Refactor ExpandConvTransLayer to share codes with ExpandConvLayer

* refactored ExpandConvLayer and ExpandConvTransLayer with ConvBaseLayerCpu

* fixed a bug in refactoring ExpandConv/TransLayer

* add another small test in test_LayerGrad for convTransLayer

* Revised deconv implementations according to luotao1

* rebase deconv implementation with develop branch and resolve conflicts with pull#218 commit 45c81a4

* deconv layer implementation modification following luotao1 comments

* fix a small bug in ConvTransLayerBase in config_parser.py

* deconv implementation mionr changes in ConvBaseLayer.cpp and config_parser.py

* minor changes on deconv per luotao1 comments

* Refactored imageSize in ConvBaseLayer to MathUtil

* minor change to convTransLayer test in test_LayerGrad

* minor changes on deconv implementation and add protostr test for deconv layer

* fixed a bug in parse_conv in config_parser.py

* Generate bilinear protostr via Linux

* set mixedlayer output size according to input operator (PaddlePaddle#414)

* set mixedlayer output size according to input operator
* change from num_channel to num_channels for conv_operator (the old one is
really misleading because all the others are num_channels)

* also changed the arg name in projections.py

* change the act.name for LinearActivation() to "linear" so that it won't
fail in hl_activetype; also fix the hasinputsset in submodel

* Revise code

* use yapf to format python code, add style config file

* Add checkout name for Dockerfile

* Because in dockerhub, we cannot set the `docker build `running
  directory, we could only use `git clone` command to get the latest
  code if we put `Dockerfile` in subdirectory

* But the `git clone` will checkout the default branch only, so here
  we add a `ENV` in Dockerfile to checkout special branch or tag in
  git repo. We could change it to `V0.9.0` tag when it release.

* '*' operator overload for LayerOutput

Making '*' support the multiplication between a scalar and LayerOutput

Also changing '+' to support adding between a vector and a scalar.

Change-Id: I7daf35590dc2b2f855a29d9ef43ac57979442e0f

* change hlactivetype instead of act.name

* fix bug in sum_cost

* fix test_layerHelpers unittest error

* change python code style to pep8

* Fix bug in multple objects in define_py_sources

* Add unittest for split datasource

* Fix PaddlePaddle#436

* multi_binary_cross_entropy when ids vector is provided

* copy the data when createSparseMatrix

* format python code in demo, doc, doc_cn and paddle directories

* format python code in python directory

* modifications according to comments

* Add pre-commit config file.

* Add yapf hook to format python code.
* Add Remove CRLF

* Update pre-commit-config

* Check all files by pre commit hooks

* Bug fix in testing mode.

* Refine clang-format for Paddle style

* fix url of sub-pages

* added resnet lstm architecture from GNMT

* modify document directory structure in model config helpers

* Revert "fix url of sub-pages"

* Add ScalingProjection

out = w * input
where w is a parameter of size 1

Change-Id: Ife682d62323ceb1a20cbbf6269421b20a862d888

* Fix unittest

Change-Id: Ic80845c892c96c37a0df0ddc433fe1aeaa5a9d1c

* Fix forwardTest for ids in python swig.

* unittest need to be added. But fix the bugs first.

* Bumping up version number to v0.9.0a0

* Fix some problems in Debian build scripts.

* Mount local Paddle instead of git clone from remote.
* Use official chinese ubuntu source instead of 163 mirror.

* Update dockerfile tags

* Add version check for paddle

* Refine ver2num function, add comments

* Fix Debian package name in ubuntu install docs.

* Fix PaddlePaddle#486

* Change demo datafile location by using CDN in baidu.

* merge bugfix PaddlePaddle#593 and # 597 from develop branch

* Bumping up version number

* Add Release notes

* Refine documentation in RELEASE.md

* fix dead link for quick start

* update

* Fix Travis-CI build for release

* Remove typo in documentation.

* fix typo
@hedaoyuan hedaoyuan deleted the fix_nvcc_compile branch March 8, 2017 12:20
wangxicoding pushed a commit to wangxicoding/Paddle that referenced this pull request Dec 9, 2021
@Steffy-zxf
fix urls (PaddlePaddle#392)
b99c69b 
fix urls of DuEE & DuIE
gglin001 added a commit to graphcore/Paddle-fork that referenced this pull request Mar 17, 2022
@gglin001
update error msg (PaddlePaddle#392)
9c85fb4
AnnaTrainingG pushed a commit to AnnaTrainingG/Paddle that referenced this pull request Sep 19, 2022
@YixinKristy
Add 'face mix' online tutorial link (on AIStudio) (PaddlePaddle#392)
6e41ea0 
* revise video restore docs

* delete photos

* Update README.md

* Update install.md

* �update readme

* Update README.md

* Update get_started.md

* Update get_started.md

* Update readme en

* Update get_started.md

* Update photo_color_en.md

* add wechaty demo

* Update README.md

* Update README_cn.md

* Update README_cn.md

* Update README_cn.md

* Update README_cn.md

* Update README_cn.md

* Update motion_driving.md

* Update README_cn.md
WAYKEN-TSE pushed a commit to WAYKEN-TSE/Paddle that referenced this pull request Dec 6, 2024
@co63oc
Add report_to (PaddlePaddle#392)
ca008ff 
Add report_to

PaddlePaddle/PaddleMIX#361
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gangliao gangliao gangliao approved these changes

@backyes backyes backyes left review comments

Assignees

@reyoung reyoung

@gangliao gangliao

Labels
Bug
Projects
None yet
Milestone
0.9.0
Development

Successfully merging this pull request may close these issues.

不同编译环境编译出来的paddle_trainer性能差别较大
5 participants
@hedaoyuan @backyes @linrongyi @gangliao @reyoung