OS X makefile changes #5
Conversation
| @@ -85,9 +86,11 @@ LIBRARIES := cudart cublas curand protobuf opencv_core opencv_highgui \ | |||
| PYTHON_LIBRARIES := boost_python python2.7 | |||
| WARNINGS := -Wall | |||
|
|
|||
| # NOTE: on OS X, use clang++ to have NVCC play nice. | |||
There was a problem hiding this comment.
Could you move these 2 likes above - near the CUDA_DIR definition and stuff, since we may need to change it on different platforms?
(We should probably figure out how to write separate config files instead of modifying Makefile for paths... Any advice?)
There was a problem hiding this comment.
One option to split Makefile into Makefile and Makefile.config. We'd place
variables like *_DIR, CXX, etc. which are likely to change on different
computers in Makefile.config, and then include Makefile.config at the top
of Makefile. That way, hopefully only Makefile.config needs to be edited.
Another option is to figure out how to use automake/autoconf or cmake
properly :/. These tools always seem like complicated overkill, but maybe
they're the right way to go.
Ross
On Tue, Nov 26, 2013 at 7:54 AM, Yangqing Jia notifications@github.comwrote:
In Makefile:
@@ -85,9 +86,11 @@ LIBRARIES := cudart cublas curand protobuf opencv_core opencv_highgui
PYTHON_LIBRARIES := boost_python python2.7
WARNINGS := -Wall+# NOTE: on OS X, use clang++ to have NVCC play nice.
Could you move these 2 likes above - near the CUDA_DIR definition and
stuff, since we may need to change it on different platforms?(We should probably figure out how to write separate config files instead
of modifying Makefile for paths... Any advice?)—
Reply to this email directly or view it on GitHubhttps://github.com/Yangqing/caffe/pull/5/files#r7928356
.
|
Sergey - I incorporated your changes and also Ross's comment in the current Yangqing/caffe head. I'll close the pull request then :) Doing a git pull on your side should suffice (I assume...) |
|
I get a lot of warnings like This is due to defining And not having a li64 or intel64 folders, I assume they are 64bits by default. |
|
Correct, but on Linux you need those folders. One more thing that would be On Tue, Nov 26, 2013 at 12:19 PM, Sergio Guadarrama <
|
|
They are there for different platforms (e.g. on Linux there is actually a Yangqing On Tue, Nov 26, 2013 at 12:19 PM, Sergio Guadarrama <
|
merge from master
ghost
mentioned this pull request
add createvideo.py
Include CUDA only if using CUDA. Using OpenCL and CPU only didn't need include CUDA dependencies
Sync: 2015/12/20
Split legacy and non legacy version of cll_backward kernel to reduce branching
Crfasrnnlong
Make FP16 blobs support FP32 inputs.
Fix test issues
DEV-26710: Remove OHEM layer from Curalate Caffe
* 3f48aeb merge to new bvlc base c0597b1 |\ | * fc0a02e Merge pull request BVLC#6 from yahoo/jun_cos_layer | |\ | | * 807ee66 enhance cos layer | |/ | * ce1db4b Merge pull request BVLC#5 from yahoo/new_data_layer | |\ | | * d4b2bf1 new datalayer changes | |/ | * 5498759 Merge pull request BVLC#4 from yahoo/clean_permission | |\ | | * 9b7fff8 Permission change for travis | | * 8377456 Added dynamic linker resolution | | * 840d6b5 Synchedmem | | * 5fc8416 Need set_gpu_data | | * ea0a8cb Merge branch 'bvlc_master' into clean_permission | | * fb7e2a9 fix file permissions | |/ | * 611197a Merge pull request BVLC#3 from yahoo/python_path_patch | |\ | | * e107fb7 Python path patch | |/ | * 486f979 Merge pull request BVLC#2 from anfeng/master | |\ | | * 9cdfeb2 fix field Id for dataframe_format | |/ | * f4e26f1 move dataframe format setting into prototxt | * 23b0191 Merge pull request BVLC#1 from yahoo/afeng_df | |\ | | * 177e0d9 MemoryDataLayer optional fields for DataFrames | |/ | * 4b677c6 initial commit * eb8dfc8 Merge pull request BVLC#6 |\ | * 864aa65 implement CPU-GPU parameter update for data parallelism * 411aafd Merge pull request BVLC#5 * 0cb7d18 Avoid sending the prefetched batch back to host
No description provided.