Conversation
There was a problem hiding this comment.
This should stay Makefile.config unless we're going to write a separate Makefile.config.osx.example and Makefile.config.linux.example.
There was a problem hiding this comment.
I will be happy to share my Makefile.config.osx and Makefile.config.linux
as examples
Sergio
2014-02-11 Evan Shelhamer notifications@github.com:
In Makefile:
@@ -2,7 +2,34 @@
PROJECT := caffe
TEST_GPUID := 0-include Makefile.config
+# detect OS
+OSLOWER = $(shell uname -s 2>/dev/null | tr [:upper:] [:lower:])
+# 'linux' is output for Linux system, 'darwin' for OS X
+OSX =$(strip $ (findstring darwin, $(OSLOWER)))
+LINUX =$(strip $ (findstring linux, $(OSLOWER)))
+ifneq ($(DARWIN),)
+# Specific to OS X
- include Makefile.config.mac
This should stay Makefile.config unless we're going to write a separate
Makefile.config.osx.example and Makefile.config.linux.example.Reply to this email directly or view it on GitHubhttps://github.com//pull/95/files#r9654662
.
|
I agree with @shelhamer, this shouldn't be. |
|
On further thought, I think we should just add more stuff to existing Makefile.config.example, doing now. |
|
Wait wait, look at the Or, oh fevered dream, we could make an actual build system. |
|
should these live in a folder instead of a branch? |
|
Sure, it's time for a |
|
I just added more info to the example config file. Someday we'll do a proper build system. |
standardize memory optimization configurations * yjxiong/fix/mem_config: take care of share data with excluded blob improvise memory opt configs fix cudnn conv legacy bug (BVLC#96) add TOC Update README.md Update README.md (BVLC#95) Update README.md Improve the python interface (BVLC#80) Update README.md
…caffe into imagenet_vid_2016 * 'imagenet_vid_2016' of https://github.com/myfavouritekk/caffe: take care of share data with excluded blob Revert "Fix a but when setting no_mem_opt: true for layers near in-place layers." improvise memory opt configs fix cudnn conv legacy bug (BVLC#96) add TOC Update README.md Update README.md (BVLC#95) Update README.md Improve the python interface (BVLC#80) Update README.md
Fix to ignore 255 key as suggested by JimKlingshirn in BVLC#95
Added OS detection to Makefile
That allows one to use a different Makefile.config depending of the OS one is compiling in