You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/09/23 22:11:39 UTC
[GitHub] eric-haibin-lin commented on a change in pull request #12645: allow
custom path and static linking for custom mallocs in make
eric-haibin-lin commented on a change in pull request #12645: allow custom path and static linking for custom mallocs in make
URL: https://github.com/apache/incubator-mxnet/pull/12645#discussion_r219713397
##########
File path: Makefile
##########
@@ -227,63 +227,96 @@ endif
# gperftools malloc library (tcmalloc)
ifeq ($(USE_GPERFTOOLS), 1)
-# FIND_LIBNAME=tcmalloc_and_profiler
- FIND_LIBNAME=tcmalloc
- FIND_LIBFILEEXT=so
- FIND_LIBFILE=$(wildcard /lib/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- FIND_LIBFILE=$(wildcard /usr/lib/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- FIND_LIBFILE=$(wildcard /usr/local/lib/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- FIND_LIBFILE=$(wildcard /usr/lib64/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- USE_GPERFTOOLS=0
- endif
- endif
- endif
- endif
- ifeq ($(USE_GPERFTOOLS), 1)
- CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
- LDFLAGS += $(FIND_LIBFILE)
- endif
+FIND_LIBFILE=$(wildcard $(USE_GPERFTOOLS_PATH)/libtcmalloc.a)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard $(USE_GPERFTOOLS_PATH)/libtcmalloc.so)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /lib/libtcmalloc.a)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /lib/libtcmalloc.so)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /usr/lib/libtcmalloc.a)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /usr/lib/libtcmalloc.so)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /usr/local/lib/libtcmalloc.a)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /usr/local/lib/libtcmalloc.so)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /usr/lib64/libtcmalloc.a)
+ifeq (,$(FIND_LIBFILE))
+FIND_LIBFILE=$(wildcard /usr/lib64/libtcmalloc.so)
+ifeq (,$(FIND_LIBFILE))
+ USE_GPERFTOOLS=0
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+ifeq ($(USE_GPERFTOOLS), 1)
+ CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
+ LDFLAGS += $(FIND_LIBFILE)
endif
# jemalloc malloc library (if not using gperftools)
-ifneq ($(USE_GPERFTOOLS), 1)
- ifeq ($(USE_JEMALLOC), 1)
- FIND_LIBNAME=jemalloc
- FIND_LIBFILEEXT=so
- FIND_LIBFILE=$(wildcard /lib/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- FIND_LIBFILE=$(wildcard /usr/lib/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- FIND_LIBFILE=$(wildcard /usr/local/lib/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- FIND_LIBFILE=$(wildcard /usr/lib/x86_64-linux-gnu/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- FIND_LIBFILE=$(wildcard /usr/lib64/lib$(FIND_LIBNAME).$(FIND_LIBFILEEXT))
- ifeq (,$(FIND_LIBFILE))
- USE_JEMALLOC=0
- endif
- endif
- endif
- endif
- endif
- ifeq ($(USE_JEMALLOC), 1)
- CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc \
- -fno-builtin-free -DUSE_JEMALLOC
- LDFLAGS += $(FIND_LIBFILE)
- endif
- endif
+else
+ifeq ($(USE_JEMALLOC), 1)
Review comment:
Add `USE_JEMALLOC_PATH` to `make/config.mk`? Otherwise people won't notice there's such option
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services