Fix #define
Activate LibSparsePCReader on Linux build Make file name consistent with Windows Activate LibSparsePCReader on Linux build Make file name consistent with Windows Activate LibSparsePCReader on Linux build Make file name consistent with Windows Fix reader on Linux Activate LibSparsePCReader on Linux build Make file name consistent with Windows Activate LibSparsePCReader on Linux build Make file name consistent with Windows Activate LibSparsePCReader on Linux build Make file name consistent with Windows Activate LibSparsePCReader on Linux build Make file name consistent with Windows
This commit is contained in:
Clemens Marschner
Родитель
a7a14abfc2
Коммит
734baf94c7
140
Makefile
140
Makefile
|
|
@ -401,6 +401,146 @@ $(SPARSEPCREADER): $(SPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
|||
|
||||
|
||||
|
||||
########################################
|
||||
# SparsePCReader plugin
|
||||
########################################
|
||||
|
||||
SPARSEPCREADER_SRC =\
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
|
||||
|
||||
LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
|
||||
|
||||
SPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
|
||||
ALL += $(SPARSEPCREADER)
|
||||
SRC+=$(SPARSEPCREADER_SRC)
|
||||
|
||||
$(SPARSEPCREADER): $(SPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
||||
@echo $(SEPARATOR)
|
||||
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
|
||||
|
||||
|
||||
|
||||
########################################
|
||||
# SparsePCReader plugin
|
||||
########################################
|
||||
|
||||
SPARSEPCREADER_SRC =\
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
|
||||
|
||||
LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
|
||||
|
||||
LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
|
||||
ALL += $(LIBSPARSEPCREADER)
|
||||
SRC+=$(LIBSPARSEPCREADER_SRC)
|
||||
|
||||
$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
||||
@echo $(SEPARATOR)
|
||||
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
|
||||
|
||||
|
||||
|
||||
########################################
|
||||
# SparsePCReader plugin
|
||||
########################################
|
||||
|
||||
SPARSEPCREADER_SRC =\
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
|
||||
|
||||
LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
|
||||
|
||||
LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
|
||||
ALL += $(LIBSPARSEPCREADER)
|
||||
SRC+=$(LIBSPARSEPCREADER_SRC)
|
||||
|
||||
$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
||||
@echo $(SEPARATOR)
|
||||
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
|
||||
|
||||
|
||||
|
||||
########################################
|
||||
# SparsePCReader plugin
|
||||
########################################
|
||||
|
||||
SPARSEPCREADER_SRC =\
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
|
||||
|
||||
LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
|
||||
|
||||
LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
|
||||
ALL += $(LIBSPARSEPCREADER)
|
||||
SRC+=$(LIBSPARSEPCREADER_SRC)
|
||||
|
||||
$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
||||
@echo $(SEPARATOR)
|
||||
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
|
||||
|
||||
|
||||
|
||||
########################################
|
||||
# SparsePCReader plugin
|
||||
########################################
|
||||
|
||||
SPARSEPCREADER_SRC =\
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
|
||||
|
||||
LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
|
||||
|
||||
LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
|
||||
ALL += $(LIBSPARSEPCREADER)
|
||||
SRC+=$(LIBSPARSEPCREADER_SRC)
|
||||
|
||||
$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
||||
@echo $(SEPARATOR)
|
||||
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
|
||||
|
||||
|
||||
|
||||
########################################
|
||||
# SparsePCReader plugin
|
||||
########################################
|
||||
|
||||
SPARSEPCREADER_SRC =\
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
|
||||
|
||||
LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
|
||||
|
||||
LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
|
||||
ALL += $(LIBSPARSEPCREADER)
|
||||
SRC+=$(LIBSPARSEPCREADER_SRC)
|
||||
|
||||
$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
||||
@echo $(SEPARATOR)
|
||||
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
|
||||
|
||||
|
||||
|
||||
########################################
|
||||
# SparsePCReader plugin
|
||||
########################################
|
||||
|
||||
SPARSEPCREADER_SRC =\
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/Exports.cpp \
|
||||
$(SOURCEDIR)/Readers/SparsePCReader/SparsePCReader.cpp \
|
||||
|
||||
LIBSPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSPARCEPCREADER_SRC))
|
||||
|
||||
LIBSPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
|
||||
ALL += $(LIBSPARSEPCREADER)
|
||||
SRC+=$(LIBSPARSEPCREADER_SRC)
|
||||
|
||||
$(LIBSPARSEPCREADER): $(LIBSPARSEPCREADER_OBJ) | $(CNTKMATH_LIB)
|
||||
@echo $(SEPARATOR)
|
||||
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
|
||||
|
||||
|
||||
|
||||
########################################
|
||||
# Kaldi plugins
|
||||
########################################
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
// Windows or Posix? Originally the reader was done only for Windows. Keep it this way for now when running on Windows.
|
||||
#ifdef __WINDOWS__
|
||||
#define SPARSE_PCREADER_USE_WINDOWS_API 1
|
||||
#define SPARSE_PCREADER_USE_WINDOWS_API
|
||||
#endif
|
||||
|
||||
namespace Microsoft { namespace MSR { namespace CNTK {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче