Skip to content

Comments

Added OS Detection in makefile#95

Closed
sguada wants to merge 2 commits intoBVLC:masterfrom
sguada:os_makefile
Closed

Added OS Detection in makefile#95
sguada wants to merge 2 commits intoBVLC:masterfrom
sguada:os_makefile

Conversation

@sguada
Copy link
Contributor

@sguada sguada commented Feb 12, 2014

Added OS detection to Makefile
That allows one to use a different Makefile.config depending of the OS one is compiling in

Copy link
Member

Choose a reason for hiding this comment

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

This should stay Makefile.config unless we're going to write a separate Makefile.config.osx.example and Makefile.config.linux.example.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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
.

@sergeyk
Copy link
Contributor

sergeyk commented Feb 26, 2014

I agree with @shelhamer, this shouldn't be.
Good idea on Makefile.config.osx, however! Will contribute mine directly to master (no PR), feel free to change.

@sergeyk sergeyk closed this Feb 26, 2014
@sergeyk
Copy link
Contributor

sergeyk commented Feb 26, 2014

On further thought, I think we should just add more stuff to existing Makefile.config.example, doing now.

@shelhamer
Copy link
Member

Wait wait, look at the makefiles branch. We can collect various makefiles there if there should be separate ones. Otherwise, I agree with you: add the details to Makefile.config.example.

Or, oh fevered dream, we could make an actual build system.

@sergeyk
Copy link
Contributor

sergeyk commented Feb 26, 2014

should these live in a folder instead of a branch?

@shelhamer
Copy link
Member

Sure, it's time for a make dir. Perhaps it'll encourage contributing improvements to the build and configuration. Feel free to bring them back in the fold and delete the branch.

@sergeyk
Copy link
Contributor

sergeyk commented Feb 26, 2014

I just added more info to the example config file. Someday we'll do a proper build system.

myfavouritekk pushed a commit to myfavouritekk/caffe that referenced this pull request Aug 11, 2016
myfavouritekk added a commit to myfavouritekk/caffe that referenced this pull request Aug 11, 2016
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
myfavouritekk added a commit to myfavouritekk/caffe that referenced this pull request Aug 15, 2016
…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
mindcont pushed a commit to mindcont/caffe that referenced this pull request Apr 25, 2017
Fix to ignore 255 key as suggested by JimKlingshirn in BVLC#95
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants