CNTK/Makefile

1327 строки
49 KiB
Makefile
Исходник Обычный вид История

# Makefile for a Linux/GCC build of CNTK
#
# The Linux and Windows versions are not different branches, but rather build off the same
# source files, using different makefiles. This current makefile has the purpose of enabling
# work to make all sources compile with GCC, and also to check for GCC-compat regressions due to
# modifications which are currently done under Windows.
#
# To use this Makefile, create a directory to build in and make a Config.make in the directory
# that provides
# BUILDTYPE= One of release or debug
# defaults to release
2016-06-14 18:39:24 +03:00
# MKL_PATH= path to CNTK custom MKL installation
# only needed if MATHLIB=mkl
# CNTK_CUSTOM_MKL_VERSION=2
# version for the CNTK custom MKL installation
# MKL_THREADING=parallel|sequential
# only needed if MATHLIB=mkl
# GDK_INCLUDE_PATH= path to CUDA GDK include path, so $(GDK_INCLUDE_PATH)/nvml.h exists
# defaults to /usr/include/nvidia/gdk
# GDK_NVML_LIB_PATH= path to CUDA GDK (stub) library path, so $(GDK_NVML_LIB_PATH)/libnvidia-ml.so exists
# defaults to /usr/src/gdk/nvml/lib
2016-08-16 15:59:15 +03:00
# MATHLIB= mkl
# defaults to mkl
# CUDA_PATH= Path to CUDA
# If not specified, GPU will not be enabled
# CUB_PATH= path to NVIDIA CUB installation, so $(CUB_PATH)/cub/cub.cuh exists
# defaults to /usr/local/cub-1.4.1
# CUDNN_PATH= path to NVIDIA cuDNN installation so $(CUDNN_PATH)/cuda/include/cudnn.h exists
# CuDNN version needs to be 5.0 or higher.
# KALDI_PATH= Path to Kaldi
# If not specified, Kaldi plugins will not be built
# OPENCV_PATH= path to OpenCV 3.1.0 installation, so $(OPENCV_PATH) exists
# defaults to /usr/local/opencv-3.1.0
2016-10-25 01:33:31 +03:00
# PROTOBUF_PATH= path to Protocol Buffers 3.1.0 installation, so $(PROTOBUF_PATH) exists
# defaults to /usr/local/protobuf-3.1.0
# LIBZIP_PATH= path to libzip installation, so $(LIBZIP_PATH) exists
# defaults to /usr/local/
# BOOST_PATH= path to Boost installation, so $(BOOST_PATH)/include/boost/test/unit_test.hpp
# defaults to /usr/local/boost-1.60.0
# PYTHON_SUPPORT=true iff CNTK v2 Python module should be build
# SWIG_PATH= path to SWIG (>= 3.0.10)
# PYTHON_VERSIONS= list of Python versions to build for
2016-12-19 15:49:05 +03:00
# A Python version is identified by "27", "34", or "35".
# PYTHON27_PATH= path to Python 2.7 interpreter
# PYTHON34_PATH= path to Python 3.4 interpreter
# PYTHON35_PATH= path to Python 3.5 interpreter
# These can be overridden on the command line, e.g. make BUILDTYPE=debug
# TODO: Build static libraries for common dependencies that are shared by multiple
# targets, e.g. eval and CNTK.
ARCH=$(shell uname)
ifndef BUILD_TOP
BUILD_TOP=.
endif
ifneq ("$(wildcard $(BUILD_TOP)/Config.make)","")
include $(BUILD_TOP)/Config.make
else
2016-01-22 18:27:50 +03:00
$(error Cannot find $(BUILD_TOP)/Config.make. Please see CNTK Wiki at https://github.com/Microsoft/cntk/wiki for configuration instructions.)
endif
ifndef BUILDTYPE
$(info Defaulting BUILDTYPE=release)
BUILDTYPE=release
endif
ifndef MATHLIB
2016-08-16 15:59:15 +03:00
$(info DEFAULTING MATHLIB=mkl)
MATHLIB = mkl
endif
#### Configure based on options above
# The mpic++ wrapper only adds MPI specific flags to the g++ command line.
# The actual compiler/linker flags added can be viewed by running 'mpic++ --showme:compile' and 'mpic++ --showme:link'
CXX = $(MPI_PATH)/bin/mpic++
SSE_FLAGS = -msse4.1 -mssse3
2016-10-25 01:33:31 +03:00
PROTOC = $(PROTOBUF_PATH)/bin/protoc
# Settings for ARM64 architectures that use a crosscompiler on a host machine.
#CXX = aarch64-linux-gnu-g++
#SSE_FLAGS =
2015-12-15 11:58:24 +03:00
SOURCEDIR:= Source
INCLUDEPATH:= $(addprefix $(SOURCEDIR)/, Common/Include CNTKv2LibraryDll CNTKv2LibraryDll/API CNTKv2LibraryDll/proto Math CNTK ActionsLib ComputationNetworkLib SGDLib SequenceTrainingLib CNTK/BrainScript Readers/ReaderLib PerformanceProfilerDll)
2016-10-25 01:33:31 +03:00
INCLUDEPATH+=$(PROTOBUF_PATH)/include
# COMMON_FLAGS include settings that are passed both to NVCC and C++ compilers.
COMMON_FLAGS:= -D_POSIX_SOURCE -D_XOPEN_SOURCE=600 -D__USE_XOPEN2K -std=c++11
CPPFLAGS:=
CXXFLAGS:= $(SSE_FLAGS) -std=c++0x -fopenmp -fpermissive -fPIC -Werror -fcheck-new
LIBPATH:=
LIBS_LIST:=
LDFLAGS:=
CXXVER_GE480:= $(shell expr `$(CXX) -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40800)
ifeq ($(CXXVER_GE480),1)
CXXFLAGS += -Wno-error=literal-suffix
endif
SEPARATOR = "=-----------------------------------------------------------="
ALL:=
ALL_LIBS:=
LIBS_FULLPATH:=
SRC:=
# Make sure all is the first (i.e. default) target, but we can't actually define it
# this early in the file, so let buildall do the work.
all : buildall
# Set up basic nvcc options and add CUDA targets from above
CUFLAGS = -m 64
ifdef CUDA_PATH
ifndef GDK_INCLUDE_PATH
GDK_INCLUDE_PATH=/usr/include/nvidia/gdk
$(info defaulting GDK_INCLUDE_PATH to $(GDK_INCLUDE_PATH))
endif
ifndef GDK_NVML_LIB_PATH
GDK_NVML_LIB_PATH=/usr/src/gdk/nvml/lib
$(info defaulting GDK_NVML_LIB_PATH to $(GDK_NVML_LIB_PATH))
2015-10-13 02:36:40 +03:00
endif
ifndef CUB_PATH
$(info defaulting CUB_PATH to /usr/local/cub-1.4.1)
CUB_PATH=/usr/local/cub-1.4.1
endif
DEVICE = gpu
NVCC = $(CUDA_PATH)/bin/nvcc
INCLUDEPATH+=$(GDK_INCLUDE_PATH)
2015-10-13 02:36:40 +03:00
INCLUDEPATH+=$(CUB_PATH)
# Set up CUDA includes and libraries
INCLUDEPATH += $(CUDA_PATH)/include
LIBPATH += $(CUDA_PATH)/lib64
LIBS_LIST += cublas cudart cuda curand cusparse nvidia-ml
# Set up cuDNN if needed
ifdef CUDNN_PATH
INCLUDEPATH += $(CUDNN_PATH)/cuda/include
LIBPATH += $(CUDNN_PATH)/cuda/lib64
LIBS_LIST += cudnn
COMMON_FLAGS +=-DUSE_CUDNN
endif
# Set up NCCL if needed
ifdef NCCL_PATH
INCLUDEPATH += $(NCCL_PATH)/include
LIBPATH += $(NCCL_PATH)/lib
LIBS_LIST += nccl
COMMON_FLAGS += -DUSE_NCCL
endif
else
DEVICE = cpu
COMMON_FLAGS +=-DCPUONLY
endif
ifeq ("$(MATHLIB)","mkl")
2016-06-14 18:39:24 +03:00
INCLUDEPATH += $(MKL_PATH)/$(CNTK_CUSTOM_MKL_VERSION)/include
LIBS_LIST += m
2016-06-14 18:39:24 +03:00
ifeq ("$(MKL_THREADING)","sequential")
LIBPATH += $(MKL_PATH)/$(CNTK_CUSTOM_MKL_VERSION)/x64/sequential
LIBS_LIST += mkl_cntk_s
2016-06-14 18:39:24 +03:00
else
LIBPATH += $(MKL_PATH)/$(CNTK_CUSTOM_MKL_VERSION)/x64/parallel
LIBS_LIST += mkl_cntk_p iomp5 pthread
2016-06-14 18:39:24 +03:00
endif
COMMON_FLAGS += -DUSE_MKL
endif
ifeq ("$(MATHLIB)","openblas")
INCLUDEPATH += $(OPENBLAS_PATH)/include
LIBPATH += $(OPENBLAS_PATH)/lib
LIBS_LIST += openblas m pthread
CPPFLAGS += -DUSE_OPENBLAS
endif
ifdef KALDI_PATH
########## Copy includes and defines from $(KALDI_PATH)/src/kaldi.mk ##########
FSTROOT = $(KALDI_PATH)/tools/openfst
ATLASINC = $(KALDI_PATH)/tools/ATLAS/include
INCLUDEPATH += $(KALDI_PATH)/src $(ATLASINC) $(FSTROOT)/include
CPPFLAGS += -DKALDI_DOUBLEPRECISION=0 -DHAVE_POSIX_MEMALIGN -DHAVE_EXECINFO_H=1 -DHAVE_CXXABI_H -DHAVE_ATLAS -DHAVE_OPENFST_GE_10400
KALDI_LIBPATH += $(KALDI_PATH)/src/lib
KALDI_LIBS_LIST := kaldi-util kaldi-matrix kaldi-base kaldi-hmm kaldi-cudamatrix kaldi-nnet kaldi-lat
KALDI_LIBS := $(addprefix -l,$(KALDI_LIBS_LIST))
endif
ifdef SUPPORT_AVX2
CPPFLAGS += -mavx2
endif
2015-09-03 22:17:17 +03:00
# Set up nvcc target architectures (will generate code to support them all, i.e. fat-binary, in release mode)
# In debug mode we will rely on JIT to create code "on the fly" for the underlying architecture
GENCODE_SM30 := -gencode arch=compute_30,code=\"sm_30,compute_30\"
GENCODE_SM35 := -gencode arch=compute_35,code=\"sm_35,compute_35\"
GENCODE_SM50 := -gencode arch=compute_50,code=\"sm_50,compute_50\"
# Should we relocate *.gcno and *.gcda files using -fprofile-dir option?
# Use GCOV_PREFIX and GCOV_PREFIX_STRIP if relocating:
# For example, if the object file /user/build/foo.o was built with -fprofile-arcs, the final executable will try to create the data file
# /user/build/foo.gcda when running on the target system. This will fail if the corresponding directory does not exist and it is unable
# to create it. This can be overcome by, for example, setting the environment as 'GCOV_PREFIX=/target/run' and 'GCOV_PREFIX_STRIP=1'.
# Such a setting will name the data file /target/run/build/foo.gcda
ifdef CNTK_CODE_COVERAGE
CXXFLAGS += -fprofile-arcs -ftest-coverage
LDFLAGS += -lgcov --coverage
endif
ifeq ("$(BUILDTYPE)","debug")
2015-09-18 02:57:26 +03:00
ifdef CNTK_CUDA_CODEGEN_DEBUG
GENCODE_FLAGS := $(CNTK_CUDA_CODEGEN_DEBUG)
else
2016-06-15 21:10:07 +03:00
GENCODE_FLAGS := $(GENCODE_SM30)
2015-09-18 02:57:26 +03:00
endif
CXXFLAGS += -g
LDFLAGS += -rdynamic
COMMON_FLAGS += -D_DEBUG -DNO_SYNC
2016-01-09 03:41:45 +03:00
CUFLAGS += -O0 -g -use_fast_math -lineinfo $(GENCODE_FLAGS)
endif
ifeq ("$(BUILDTYPE)","release")
2015-09-18 02:57:26 +03:00
ifdef CNTK_CUDA_CODEGEN_RELEASE
GENCODE_FLAGS := $(CNTK_CUDA_CODEGEN_RELEASE)
else
2016-06-15 21:10:07 +03:00
GENCODE_FLAGS := $(GENCODE_SM30) $(GENCODE_SM35) $(GENCODE_SM50)
2015-09-18 02:57:26 +03:00
endif
CXXFLAGS += -g -O4
LDFLAGS += -rdynamic
2016-03-01 21:35:21 +03:00
COMMON_FLAGS += -DNDEBUG -DNO_SYNC
CUFLAGS += -O3 -g -use_fast_math $(GENCODE_FLAGS)
endif
ifdef CNTK_CUDA_DEVICE_DEBUGINFO
CUFLAGS += -G
endif
# Create the library link options for the linker.
# LIBS_LIST must not be changed beyond this point.
LIBS:= $(addprefix -l,$(LIBS_LIST))
OBJDIR:= $(BUILD_TOP)/.build
BINDIR:= $(BUILD_TOP)/bin
LIBDIR:= $(BUILD_TOP)/lib
PYTHONDIR:= $(BUILD_TOP)/python
ORIGINLIBDIR:='$$ORIGIN/../lib'
ORIGINDIR:='$$ORIGIN'
CNTKMATH:=cntkmath
RPATH=-Wl,-rpath,
########################################
2015-12-15 11:58:24 +03:00
# Build info
########################################
2015-12-15 11:58:24 +03:00
BUILDINFO:= $(SOURCEDIR)/CNTK/buildinfo.h
GENBUILD:=Tools/generate_build_info
BUILDINFO_OUTPUT := $(shell $(GENBUILD) $(BUILD_TOP)/Config.make && echo Success)
ifneq ("$(BUILDINFO_OUTPUT)","Success")
$(error Could not generate $(BUILDINFO))
endif
########################################
# Performance profiler library
########################################
PERF_PROFILER:=perfprofiler
PP_SRC =\
$(SOURCEDIR)/PerformanceProfilerDll/PerformanceProfiler.cpp \
$(SOURCEDIR)/Common/File.cpp \
$(SOURCEDIR)/Common/fileutil.cpp \
$(SOURCEDIR)/Common/ExceptionWithCallStack.cpp \
PP_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(PP_SRC))
PERF_PROFILER_LIB:= $(LIBDIR)/lib$(PERF_PROFILER).so
ALL += $(PERF_PROFILER_LIB)
SRC += $(PP_SRC)
$(PERF_PROFILER_LIB): $(PP_OBJ)
@echo $(SEPARATOR)
@echo creating $@ for $(ARCH) with build type $(BUILDTYPE)
@mkdir -p $(dir $@)
$(CXX) $(LDFLAGS) -shared $(patsubst %,$(RPATH)%, $(ORIGINDIR)) -o $@ $^
########################################
# Math library
########################################
# Define all sources that need to be built
READER_SRC =\
2016-02-02 15:31:59 +03:00
$(SOURCEDIR)/Readers/ReaderLib/BlockRandomizer.cpp \
$(SOURCEDIR)/Readers/ReaderLib/Bundler.cpp \
2016-02-02 15:31:59 +03:00
$(SOURCEDIR)/Readers/ReaderLib/NoRandomizer.cpp \
$(SOURCEDIR)/Readers/ReaderLib/ReaderShim.cpp \
$(SOURCEDIR)/Readers/ReaderLib/ChunkRandomizer.cpp \
$(SOURCEDIR)/Readers/ReaderLib/SequenceRandomizer.cpp \
$(SOURCEDIR)/Readers/ReaderLib/SequencePacker.cpp \
$(SOURCEDIR)/Readers/ReaderLib/TruncatedBpttPacker.cpp \
2016-03-30 14:06:08 +03:00
$(SOURCEDIR)/Readers/ReaderLib/PackerBase.cpp \
$(SOURCEDIR)/Readers/ReaderLib/FramePacker.cpp \
$(SOURCEDIR)/Readers/ReaderLib/ReaderBase.cpp \
2016-09-30 17:27:53 +03:00
$(SOURCEDIR)/Readers/ReaderLib/Indexer.cpp \
$(SOURCEDIR)/Readers/ReaderLib/ChunkCache.cpp \
COMMON_SRC =\
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Common/Config.cpp \
$(SOURCEDIR)/Common/Globals.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Common/DataReader.cpp \
$(SOURCEDIR)/Common/DataWriter.cpp \
$(SOURCEDIR)/Common/ExceptionWithCallStack.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Common/Eval.cpp \
$(SOURCEDIR)/Common/File.cpp \
$(SOURCEDIR)/Common/TimerUtility.cpp \
$(SOURCEDIR)/Common/fileutil.cpp \
$(SOURCEDIR)/Common/Sequences.cpp \
MATH_SRC =\
$(SOURCEDIR)/Math/BatchNormalizationEngine.cpp \
2016-06-17 18:57:55 +03:00
$(SOURCEDIR)/Math/BlockHandlerSSE.cpp \
$(SOURCEDIR)/Math/CUDAPageLockedMemAllocator.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Math/CPUMatrix.cpp \
$(SOURCEDIR)/Math/CPURNGHandle.cpp \
$(SOURCEDIR)/Math/CPUSparseMatrix.cpp \
$(SOURCEDIR)/Math/ConvolutionEngine.cpp \
2016-01-05 21:42:38 +03:00
$(SOURCEDIR)/Math/MatrixQuantizerImpl.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Math/MatrixQuantizerCPU.cpp \
$(SOURCEDIR)/Math/Matrix.cpp \
$(SOURCEDIR)/Math/QuantizedMatrix.cpp \
2016-09-07 16:46:20 +03:00
$(SOURCEDIR)/Math/DataTransferer.cpp \
$(SOURCEDIR)/Math/RNGHandle.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Math/TensorView.cpp \
$(SOURCEDIR)/Math/NcclComm.cpp \
ifdef SUPPORT_AVX2
MATH_SRC +=\
$(SOURCEDIR)/Math/BlockHandlerAVX.cpp \
endif
ifdef CUDA_PATH
MATH_SRC +=\
$(SOURCEDIR)/Math/CuDnnBatchNormalization.cu \
$(SOURCEDIR)/Math/CuDnnCommon.cu \
$(SOURCEDIR)/Math/CuDnnConvolutionEngine.cu \
$(SOURCEDIR)/Math/CuDnnRNN.cpp \
$(SOURCEDIR)/Math/GPUDataTransferer.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Math/GPUMatrix.cu \
$(SOURCEDIR)/Math/GPUSparseMatrix.cu \
$(SOURCEDIR)/Math/GPUTensor.cu \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Math/GPUWatcher.cu \
$(SOURCEDIR)/Math/GPURNGHandle.cu \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Math/MatrixQuantizerGPU.cu \
else
MATH_SRC +=\
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Math/NoGPU.cpp
endif
MATH_SRC+=$(COMMON_SRC)
MATH_SRC+=$(READER_SRC)
MATH_OBJ := $(patsubst %.cu, $(OBJDIR)/%.o, $(patsubst %.cpp, $(OBJDIR)/%.o, $(MATH_SRC)))
CNTKMATH_LIB:= $(LIBDIR)/lib$(CNTKMATH).so
ALL_LIBS += $(CNTKMATH_LIB)
SRC+=$(MATH_SRC)
$(CNTKMATH_LIB): $(MATH_OBJ) | $(PERF_PROFILER_LIB)
@echo $(SEPARATOR)
2015-12-15 11:58:24 +03:00
@echo creating $@ for $(ARCH) with build type $(BUILDTYPE)
@mkdir -p $(dir $@)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBPATH) $(LIBDIR) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -fopenmp -l$(PERF_PROFILER)
# Any executable using Common or ReaderLib needs to link these libraries.
READER_LIBS := $(CNTKMATH_LIB) $(PERF_PROFILER_LIB)
L_READER_LIBS := -l$(CNTKMATH) -l$(PERF_PROFILER)
########################################
2016-06-11 22:21:15 +03:00
# CNTKLibrary
########################################
2016-06-11 22:21:15 +03:00
CNTK_COMMON_SRC =\
$(SOURCEDIR)/Common/BestGpu.cpp \
$(SOURCEDIR)/Common/MPIWrapper.cpp \
COMPUTATION_NETWORK_LIB_SRC =\
$(SOURCEDIR)/ComputationNetworkLib/ComputationNode.cpp \
$(SOURCEDIR)/ComputationNetworkLib/ComputationNodeScripting.cpp \
$(SOURCEDIR)/ComputationNetworkLib/InputAndParamNodes.cpp \
$(SOURCEDIR)/ComputationNetworkLib/RecurrentNodes.cpp \
$(SOURCEDIR)/ComputationNetworkLib/LinearAlgebraNodes.cpp \
2016-06-11 22:21:15 +03:00
$(SOURCEDIR)/ComputationNetworkLib/ReshapingNodes.cpp \
$(SOURCEDIR)/ComputationNetworkLib/RNNNodes.cpp \
2016-06-11 22:21:15 +03:00
$(SOURCEDIR)/ComputationNetworkLib/SpecialPurposeNodes.cpp \
$(SOURCEDIR)/ComputationNetworkLib/ComputationNetwork.cpp \
$(SOURCEDIR)/ComputationNetworkLib/ComputationNetworkEvaluation.cpp \
$(SOURCEDIR)/ComputationNetworkLib/ComputationNetworkAnalysis.cpp \
$(SOURCEDIR)/ComputationNetworkLib/ComputationNetworkEditing.cpp \
$(SOURCEDIR)/ComputationNetworkLib/ComputationNetworkBuilder.cpp \
$(SOURCEDIR)/ComputationNetworkLib/ComputationNetworkScripting.cpp \
2016-09-30 18:05:00 +03:00
$(SOURCEDIR)/ComputationNetworkLib/TrainingNodes.cpp \
2016-06-11 22:21:15 +03:00
SEQUENCE_TRAINING_LIB_SRC =\
$(SOURCEDIR)/SequenceTrainingLib/latticeforwardbackward.cpp \
$(SOURCEDIR)/SequenceTrainingLib/parallelforwardbackward.cpp \
ifdef CUDA_PATH
SEQUENCE_TRAINING_LIB_SRC +=\
$(SOURCEDIR)/Math/cudalatticeops.cu \
$(SOURCEDIR)/Math/cudalattice.cpp \
$(SOURCEDIR)/Math/cudalib.cpp \
else
SEQUENCE_TRAINING_LIB_SRC +=\
$(SOURCEDIR)/SequenceTrainingLib/latticeNoGPU.cpp \
endif
CNTKLIBRARY_COMMON_SRC =\
$(SOURCEDIR)/CNTKv2LibraryDll/BackCompat.cpp \
2016-06-11 22:21:15 +03:00
$(SOURCEDIR)/CNTKv2LibraryDll/Common.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/Function.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/PrimitiveFunction.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/CompositeFunction.cpp \
2016-06-11 22:21:15 +03:00
$(SOURCEDIR)/CNTKv2LibraryDll/NDArrayView.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/NDMask.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/Trainer.cpp \
2016-06-11 22:21:15 +03:00
$(SOURCEDIR)/CNTKv2LibraryDll/Utils.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/Value.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/Variable.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/Learner.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/Serialization.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/DistributedCommunicator.cpp \
2016-11-28 13:44:21 +03:00
$(SOURCEDIR)/CNTKv2LibraryDll/DistributedLearnerBase.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/DataParallelDistributedLearner.cpp \
2016-10-25 01:33:31 +03:00
$(SOURCEDIR)/CNTKv2LibraryDll/proto/CNTK.pb.cc \
CNTKLIBRARY_SRC =\
$(SOURCEDIR)/CNTKv2LibraryDll/ComputeInputStatistics.cpp \
$(SOURCEDIR)/CNTKv2LibraryDll/MinibatchSource.cpp \
2016-06-11 22:21:15 +03:00
CNTKLIBRARY_SRC+=$(CNTKLIBRARY_COMMON_SRC)
2016-06-11 22:21:15 +03:00
CNTKLIBRARY_SRC+=$(CNTK_COMMON_SRC)
CNTKLIBRARY_SRC+=$(COMPUTATION_NETWORK_LIB_SRC)
CNTKLIBRARY_SRC+=$(SEQUENCE_TRAINING_LIB_SRC)
CNTKLIBRARY_VERSION=2.0
CNTKLIBRARY:=cntklibrary-$(CNTKLIBRARY_VERSION)
2016-10-25 01:33:31 +03:00
CNTKLIBRARY_OBJ:=\
$(patsubst %.cu, $(OBJDIR)/%.o, $(filter %.cu, $(CNTKLIBRARY_SRC))) \
$(patsubst %.pb.cc, $(OBJDIR)/%.pb.o, $(filter %.pb.cc, $(CNTKLIBRARY_SRC))) \
$(patsubst %.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(CNTKLIBRARY_SRC)))
2016-06-11 22:21:15 +03:00
CNTKLIBRARY_LIB:=$(LIBDIR)/lib$(CNTKLIBRARY).so
ALL_LIBS+=$(CNTKLIBRARY_LIB)
2016-06-11 22:21:15 +03:00
SRC+=$(CNTKLIBRARY_SRC)
$(CNTKLIBRARY_LIB): $(CNTKLIBRARY_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
2016-10-25 01:33:31 +03:00
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
2016-12-12 16:16:10 +03:00
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -l$(CNTKMATH) $(PROTOBUF_PATH)/lib/libprotobuf.a -fopenmp
2016-06-11 22:21:15 +03:00
########################################
2016-06-11 22:21:15 +03:00
# CNTKLibrary tests
########################################
2016-10-28 01:21:56 +03:00
CNTKLIBRARY_TESTS_SRC_PATH =\
Tests/UnitTests/V2LibraryTests
CNTKLIBRARY_TESTS_SRC =\
2016-10-28 01:21:56 +03:00
$(CNTKLIBRARY_TESTS_SRC_PATH)/FeedForwardTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/Main.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/Common.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/NDArrayViewTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/RecurrentFunctionTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/BlockTests.cpp \
2016-10-28 01:21:56 +03:00
$(CNTKLIBRARY_TESTS_SRC_PATH)/TensorTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/ValueTests.cpp \
2016-10-28 01:21:56 +03:00
$(CNTKLIBRARY_TESTS_SRC_PATH)/TrainerTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/CifarResNet.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/SerializationTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/LearnerTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/FunctionTests.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/SequenceClassification.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/Seq2Seq.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/TruncatedLSTMAcousticModel.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/DeviceSelectionTests.cpp \
Squashed commit of the following: commit 6ab312be0c8477f42f6cb7abe55f0c4e415d1058 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 17 13:35:16 2016 -0800 Update 1BitSGD after merging eldak/emptyMinibatches commit e7bd91e7ed69eb16355691e75af05872d64a679f Merge: 44a1dcd 4813bde Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 17 13:31:57 2016 -0800 Merge branch 'eldak/emptyMinibatches' into kedeng/warmStart commit 4813bdec0e620b575e6daeffeab57ce3f6188370 Author: Eldar Akchurin <eldak@microsoft.com> Date: Thu Nov 17 21:17:05 2016 +0100 Fixing block momentum commit 44a1dcdf4563f1ae07039fb03927231564fdee76 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 17 11:14:19 2016 -0800 Eldar's fixes for empty minibatch commit 0aea2972b6561d925033781f476aee14a2dfdcd6 Author: Eldar Akchurin <eldak@microsoft.com> Date: Thu Nov 17 17:26:48 2016 +0100 Fixing empty minibatches commit 8aeb600b5e32304ed81b20833461a8ce7308bff6 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 16 21:50:10 2016 -0800 Squashed commit of the following: commit 3afde1a503f4e4b6fd3e3dee1c6bc7c7b573d088 Merge: 9722676 aa64648 Author: Project Philly <svcphil@microsoft.com> Date: Wed Nov 16 17:28:31 2016 -0800 Integrate ruizhao/max__utt_num_HTKReader into master commit 9722676a44f16c4795ea34ab9826c6f3378ad731 Merge: ffa0b58 9a57aeb Author: Project Philly <svcphil@microsoft.com> Date: Wed Nov 16 13:24:08 2016 -0800 Integrate mahilleb/1116Changes into master commit ffa0b58de9bac49f8871659b089348b8bb7a435b Author: Sasa Galic <sagalic@microsoft.com> Date: Mon Nov 14 15:19:18 2016 +0100 FCN training fixes Two fixes needed for FCN training are introduced in this change: * BinaryElementWiseNodes support transform interface * Crop node crops just first two dimensions of input commit 9a57aebfca396ff027e55a924e79ee8f78f8cece Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Wed Nov 16 11:19:46 2016 +0100 Tools/make_binary_drop_linux: adapt wrt new Linux images commit cc23356af2fafab3b225c899031f8da14511e153 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Wed Nov 16 10:32:24 2016 +0100 Remove legcay CNTK Python support, contrib\Python plus associated test commit 3b1448c449e5fa3655a2e5ea422f9ef11ed96535 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Mon Nov 14 11:11:35 2016 +0100 bindings/python/setup.py: link with specific .lib, not everything commit 8e79232c43827788f103b269237128cd67c1794e Author: Philipp Kranen <pkranen@microsoft.com> Date: Wed Nov 16 09:41:58 2016 +0100 fixed dimension inference for times node commit 6210f62307845d5ca5d7203383ae5b35baf0f406 Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 17:32:43 2016 +0100 towards Fast R-CNN eval only commit cbc27a94cafc55e78d3fce843bd210eb057dba6c Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 14:45:00 2016 +0100 fixed 202 and 203 tutorials commit 5d4d85540758d02c7950243c74ad9c2304d71177 Merge: 8095cea 9f39b27 Author: Qiwei Ye <chivee.ye@gmail.com> Date: Wed Nov 16 16:14:59 2016 +0800 Merge pull request #1043 from Microsoft/qiwye/asgd-dev Add windows baseline for ASGD e2e test commit 9f39b27d390a209de0ed2f4d633d03246ae2e32d Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 16 15:54:37 2016 +0800 Add windows baseline for ASGD e2e test commit aa64648458a6c137e9b3e88d031f60596418fb4c Author: RuiZhao <ruzhao@microsoft.com> Date: Mon Oct 3 14:39:04 2016 -0700 support max utt length in HTKReader commit 8095ceaa28060b7928e8729bf592f3abae3da77c Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 15 15:43:38 2016 -0800 Feedbacks and fix multi-verso build. commit 2fc89e67ccb3352c8c1954732e30e0c87f685cd5 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 15 14:32:52 2016 -0800 Explain the range in droput commit 4b1a05cd52bd0495c6841aa2ede92247fccd5146 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 15 14:21:40 2016 -0800 Add documentation for GlobalPooling and Dropout. commit f775d96a2e7bdad4b3e067b8cd03d2f0259eb480 Merge: 6157426 cb4b03b Author: Project Philly <svcphil@microsoft.com> Date: Tue Nov 15 10:19:00 2016 -0800 Integrate pkranen/scaleModePy into master commit cb4b03b647b10c681bc61d490f72348c19ac94fe Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 18:04:47 2016 +0100 addressed CR comments commit b2e18c05a3ca76fc318e7eaaa80918fe7132c13c Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 16:32:17 2016 +0100 bug fix in B2 script commit 6157426a61b857883c9f901e0e63753de7c245f7 Merge: 9f0d79b 1b794ec Author: Wolfgang Manousek <wolfma@microsoft.com> Date: Tue Nov 15 16:00:28 2016 +0100 Merge branch 'wolfma/inst-move' of https://github.com/Microsoft/CNTK into wolfma/inst-move commit 9f0d79bdd3df53e0d6a424eb1e454cc309d195cd Author: Wolfgang Manousek <wolfma@microsoft.com> Date: Tue Nov 15 09:15:26 2016 +0100 move install files into new install subdirectory beneath the script directory, remove obsolete files, update readme in script directory commit 12dc18830cbac325b86ee10594fc3dd6409441c6 Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 15:53:21 2016 +0100 fixed model removal in A2 script commit ec25403ac00a488b7e3388f0b84b407575e42b77 Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 15:45:02 2016 +0100 Support scaleMode option for image deserializer in python API commit 1898516b08cc90dc3cd2bd47f0adbda276d8546d Merge: 2340b27 e96c1b0 Author: Project Philly <svcphil@microsoft.com> Date: Tue Nov 15 04:13:17 2016 -0800 Integrate eldak/htkLongSequences into master commit 2340b27379a6a0c6b4bf5e5be810396e1f891ab1 Merge: 20da1c7 99389b3 Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 12:20:13 2016 +0100 Merge pull request #1039 from tuzzer/patch-2 Fixed formatting errors in CNTK_203_Reinforcement_Learning_Basics.ipynb commit 20da1c71577fb2b24ce900171f6cf2eaea3c6f57 Merge: a3e2648 ceeedfe Author: Philipp Kranen <pkranen@microsoft.com> Date: Tue Nov 15 11:53:35 2016 +0100 Merge pull request #1038 from tuzzer/patch-1 Fixed broken link in the tutorial docs commit e96c1b016581b3f2db74dad1b5eda2777cd38d85 Author: Eldar Akchurin <eldak@microsoft.com> Date: Mon Nov 14 12:34:10 2016 +0100 Fixing frame calculation commit 1b794ec63bb105141ebdd511fbbe3372d0d93bbd Author: Wolfgang Manousek <wolfma@microsoft.com> Date: Tue Nov 15 09:15:26 2016 +0100 move install files into new install subdirectory beneath the script directory, remove obsolete files, update readme in script directory commit a3e264884d54b25509c3d8a276b1697dd45dbce3 Author: Wolfgang Manousek <wolfma@microsoft.com> Date: Mon Nov 14 17:21:37 2016 +0100 if the target environment doesn't exist, it will be created with conda env create, for an existing environment it will now be updated through conda env update adddressed CR comments, merged master commit 99389b3032e811bfff84baf202ecdaa27f33c259 Author: Matthew Chan <matthew.tk.chan@gmail.com> Date: Mon Nov 14 22:23:40 2016 -0800 Update CNTK_203_Reinforcement_Learning_Basics.ipynb Fixed the "unknown character" problems. Fixed the problem which "Bellmann" was not part of the hyperlink. commit ceeedfeee421e5459ead351ec2aa1b2575a5febf Author: Matthew Chan <matthew.tk.chan@gmail.com> Date: Mon Nov 14 20:59:27 2016 -0800 Update tutorials.rst Link to the reinforcement learning tutorial was broken. Linking it to the v2.0.beta3.0 version like the others as well. commit c7c9ee63686614e1a7560b40c27895e86c557b8c Author: Chris Basoglu <cbasoglu@microsoft.com> Date: Mon Nov 14 17:42:03 2016 -0800 Update README.md commit 6be43ec454b99caa99d51ae366afb2f67563b1fa Author: Junjie Qian <juqia@microsoft.com> Date: Mon Nov 7 11:40:00 2016 -0800 Buffer data for file writing to reduce requests commit 7f5c78d4f986f26f5f7ca04f03cf8b5f877f2e38 Author: Philipp Kranen <pkranen@microsoft.com> Date: Mon Nov 14 21:19:20 2016 +0100 Update README.md commit 4cd62698f5707d30c7f2b658ff589ae052fe141b Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 16 21:41:13 2016 -0800 Update 1-bit SGD commit 3e284cc0983a47a752b1ebe4fa911959b10f2ed5 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 16 18:02:07 2016 -0800 Address CR comments commit b7428a741093a6fe3823f64e50cab9c83e4c84e5 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 16 16:35:34 2016 -0800 Address CR comments Add block momentum python api/example/tests commit 36979bbaab41cabd97e71270bb532be983a19d69 Merge: 84602e1 c3a7d09 Author: Ke Deng <kedeng@microsoft.com> Date: Wed Nov 16 14:01:51 2016 -0800 Merge branch 'kedeng/warmStart' of https://github.com/microsoft/cntk into kedeng/warmStart commit 84602e1d8fef48432f8c83c6ad221e87b6b9277e Author: Ke Deng <kedeng@microsoft.com> Date: Wed Nov 16 13:47:57 2016 -0800 Update distributed examples commit c3a7d0935219ace0999f7d71ee9d7e8bad1e4229 Author: Eldar Akchurin <eldak@microsoft.com> Date: Wed Nov 16 10:57:23 2016 +0100 Fixing bit overflow in the minibatch source commit c546cac30833486609975c9b1bdc95fd8168eb25 Author: KeDengMS <kedeng@microsoft.com> Date: Tue Nov 15 17:01:31 2016 -0800 Try Jenkins commit eb78b308970ac6a5de42405509c041685c7afd1a Author: KeDengMS <kedeng@microsoft.com> Date: Tue Nov 15 11:30:08 2016 -0800 Fix MinibatchSourceTest for random distributed case, as sample count may not evenly distributed to workers commit f637230ebbfc34aeb095fbea38cf5600aeb97993 Merge: 0ebd2f0 9bc7cf7 Author: KeDengMS <kedeng@microsoft.com> Date: Tue Nov 15 10:09:33 2016 -0800 Merge branch 'kedeng/warmStart' of https://github.com/Microsoft/CNTK into kedeng/warmStart commit 0ebd2f09301cafc05c401062934e9a9dbd6fba3b Author: KeDengMS <kedeng@microsoft.com> Date: Tue Nov 15 10:08:58 2016 -0800 Fix MinibatchSource to avoid double SetConfig when warmStart == 0 commit 9bc7cf7dbc11fce169edbf62cb30f1c27e6f29b5 Author: Eldar Akchurin <eldak@microsoft.com> Date: Tue Nov 15 10:21:03 2016 +0100 Fixing empty minibatch commit d931c501c5c3eea5c83154aeab8742ffbbbf64f9 Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 17:41:55 2016 -0800 ConvNet distributed example update commit f68a0d83da0955b504ddfbcd3db6d071840080d3 Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 17:16:11 2016 -0800 Add checkpoint test for distributed training Update CifarResNet_Distributed example Add ConvNet_CIFAR10_DataAug_Distributed example commit 11a6c71efed3412585e3e1feba0a5ad3ac663b7b Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 15:56:21 2016 -0800 Add test for randomized minibatch source commit 4bf787be0f433ff98d1ff2c0d0d62b6227f4eb6f Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 13:49:50 2016 -0800 Squashed commit of the following: commit d61f1de3715aee8052a14a77bf39f150271778f2 Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 13:44:34 2016 -0800 Squashed commit of the following: commit babf078b4930dab8d3e0dddeca45fa4d5021aff0 Merge: 37bc988 4ef4a91 Author: Project Philly <svcphil@microsoft.com> Date: Mon Nov 14 10:59:42 2016 -0800 Integrate alrezni/v2_scratch into master commit 37bc98867f479e05dc37b00b9a7b30038f8f5043 Merge: 90ff04f 3e0d8ba Author: Project Philly <svcphil@microsoft.com> Date: Mon Nov 14 10:17:33 2016 -0800 Integrate t-ivrodr/kernel_tests_with_padding into master commit 90ff04f25449a9ad44e795a3bf2d7cd37b05023d Author: Philipp Kranen <pkranen@microsoft.com> Date: Mon Nov 14 14:52:39 2016 +0100 fixed tutorials and VS links commit eb2dfcefc50ac1281f5b3b76126319e41252b5ca Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Mon Nov 14 12:56:43 2016 +0100 Fix a link commit 1b1edd8b1dfbdd60c1cd5a6258087ca2f6bf63ec Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Mon Nov 14 08:20:21 2016 +0100 Start editing CNTK.sln and project files commit 0d72140c753809dea6c67e0db7b69487e590f95c Author: Philipp Kranen <pkranen@microsoft.com> Date: Mon Nov 14 12:13:09 2016 +0100 removed two py files commit 3d1e93badf1697910a5270299ffefd59d8ace51f Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Fri Nov 11 18:12:43 2016 +0100 Addressed CR comments commit dbd416f5f490d8487e1bd5b12abd95e9e94b1003 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Fri Nov 11 15:42:11 2016 +0100 Update binary installers to not install Git and clone CNTK repo; Python examples included in Drop. commit fba28bf0ed888c3cec3989228cd6c49ae8907c0e Author: Philipp Kranen <pkranen@microsoft.com> Date: Thu Nov 10 13:02:35 2016 +0100 Fixed python commons and eval clients commit 9f3a510c266338235c65a97bf7b02a15348e11f4 Author: Alexey Orlov <alexeyo@microsoft.com> Date: Thu Nov 10 12:24:02 2016 +0100 Add root Tutorials folder to Binary drop. Linux commit adbe62f1576a62158a9ccbf5eaf3b020cbc725a7 Author: Alexey Orlov <alexeyo@microsoft.com> Date: Thu Nov 10 12:08:45 2016 +0100 Add root Tutorials folder to Binary drop. Windows commit 9231ece8cec2fa25b4ca06018854cfe3ffb8ea53 Author: Philipp Kranen <pkranen@microsoft.com> Date: Mon Nov 7 15:30:32 2016 +0100 Restructuring examples and tutorials commit 110aac7f3caa020892b040067b5717de9debf46b Merge: ac3866a 513182c Author: Project Philly <svcphil@microsoft.com> Date: Mon Nov 14 06:09:31 2016 -0800 Integrate alrezni/v2_loadmodel_drop_datatype into master commit 3e0d8baaa623f62148e3d133e32444b569015386 Author: Ivan Rodriguez <t-ivrodr@microsoft.com> Date: Wed Nov 2 13:27:32 2016 +0100 Adding convolution and pooling tests with different strides and padding commit ac3866a0e5e9597d0afff564358f153041bb228d Merge: b89762f 0383a01 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Mon Nov 14 13:07:33 2016 +0000 Merge remote-tracking branch 'origin/master' into mahilleb/pr/1030 commit 513182c2d7d91abb7e66c5611bca81a8e19a2844 Author: Alexey Reznichenko <alrezni@microsoft.com> Date: Fri Nov 11 15:44:10 2016 +0100 Drop dataType parameter form LoadModel commit 4ef4a91130cbf597b4660a4951cff21e0614c6e9 Author: Alexey Reznichenko <alrezni@microsoft.com> Date: Mon Nov 14 11:31:46 2016 +0100 Update hyper-parameter settings as agreed. For LR, the unit type is now a required parameter. All "non-distributed" examples use per-minibatch learning rate. For momentum, the only way to specify per-sample schedule is to use time-constant. Per-minibatch values are scaled based on the actual MB sizes. commit b89762fe96c1869c35f4627386e77173dff86fbf Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Mon Nov 14 10:16:02 2016 +0000 Tools/docker/CNTK-CPUOnly-Image/: init Multiverso submodule as well commit 0383a0134f083abd7e946f23ac8c35a8cba185c0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 13 20:39:04 2016 +0800 Fix baseline commit ad8f1fa3939937fdbde1f1e9396818013cbce337 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 13 17:37:07 2016 +0800 update linux gpu baseline for ASGD e2e test commit b9a2f3fc95e5a1a0c0042f78fcd0d45c68e7a5fc Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 13 16:52:59 2016 +0800 quick fix commit b03cea93c3ba22df5c2602a6086804324d8bef38 Author: Takuma Yoshida <me@yoavlt.com> Date: Sun Nov 13 15:13:13 2016 +0900 Fix missing space and submodule commit 325e4803376b902d1c86c01f850c27cfc3752907 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 13 13:31:48 2016 +0800 TODO: quick fix for master fixing commit 6d139b9ebc0d0e531e93514ae3ba30f3ea003054 Merge: da8b338 e618b91 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 13 13:00:38 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit da8b338865dfc445c4a18e0f413c5e5a5505dc72 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 13 13:00:00 2016 +0800 change lowercase to Uppercase for Multiverso project commit e618b917fe3db8aa5edf962bb2bfbbdab7b14860 Merge: 1f2558c acc6d4a Author: Project Philly <svcphil@microsoft.com> Date: Sat Nov 12 03:38:06 2016 -0800 Integrate qiwye/asgd-dev into master commit 1f2558c65038bf0642663672b01efbbacf128813 Author: Vadim Mazalov <vadimma@microsoft.com> Date: Fri Nov 11 17:04:21 2016 -0800 Polish run-test and yml files for external cross-entropy speech tests commit fa399c12a6bc077abf0073fe251c1f03989edbbf Author: Vadim Mazalov <vadimma@microsoft.com> Date: Fri Nov 11 16:54:45 2016 -0800 Add windows baseline for speech external CE tests commit 7ecbdf5183e6bf4aa52cfa2bf48096af9ba6d212 Author: Vadim Mazalov <vadimma@microsoft.com> Date: Wed Nov 9 10:00:09 2016 -0800 Refactor the speech E2E tests commit 668f2efe94860c57c6a9415316097e273ff4a95b Author: Vadim Mazalov <vadimma@microsoft.com> Date: Fri Nov 4 12:11:32 2016 -0700 E2E external speech tests commit ce18ad8974667aa35a2887e1db60499aaa6c90cb Merge: 6a51e64 acc6d4a Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Nov 12 13:24:19 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 6a51e6468057a0c77a6c07c3aef3ac83252d6019 Merge: af52a3c 82dc610 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Nov 12 13:22:39 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit af52a3cf57ed44abde5d26eed4ae5d9ecbf44a3f Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Nov 12 13:20:31 2016 +0800 adding warring for Windows build commit acc6d4a3c33e49c4c6bd264669a07f6049a8da0b Author: Fei Gao <feiga@users.noreply.github.com> Date: Fri Nov 11 16:06:34 2016 +0800 Update testcases.yml commit 4286c6e9bc6d5e0fb278565c8b3c8f89c04909c4 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Nov 11 12:59:14 2016 +0800 link multiverso library to EVAL_EXTENDED_CLIENT commit 417513d8aa1c8eb0d015bd804984a809f8fe9eb0 Merge: 82ebb6e 0014540 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Nov 11 12:56:40 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 82ebb6e900eb8fef6c2b0a16dd334a77b8c78a6c Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Nov 11 12:55:23 2016 +0800 build with multiverso as default commit 0014540d53af55f0fd8cfb47371fc506bd0a508a Author: Fei Gao <feiga@users.noreply.github.com> Date: Fri Nov 11 11:19:04 2016 +0800 Update testcases.yml commit a62037dbc76a6d734790ad202fb1254478c64af1 Merge: 8fad703 cbcea1b Author: unknown <qiwye@MSRAML-SRV08.fareast.corp.microsoft.com> Date: Fri Nov 11 11:01:05 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit 8fad703f27599eeeb258ab4ba359efd5522d12ee Author: unknown <qiwye@MSRAML-SRV08.fareast.corp.microsoft.com> Date: Fri Nov 11 11:00:32 2016 +0800 Avoid code duplication by refactoring WaitAll into a separate function. commit 249989b95fdcf208db2ec0faa096020945a85092 Merge: 10a6535 ac1a946 Author: unknown <qiwye@MSRAML-SRV08.fareast.corp.microsoft.com> Date: Thu Nov 10 16:50:46 2016 +0800 Merge branch 'master' into qiwye/asgd-dev # Conflicts: # CNTK.sln # Makefile commit 10a6535ef9b869fbb286a16d23cc3bc8131e3e57 Author: unknown <qiwye@MSRAML-SRV08.fareast.corp.microsoft.com> Date: Thu Nov 10 16:42:01 2016 +0800 add WaitAll() for ASGD situation commit 6264cc1c31ca5ec30a90b0593937df047109f059 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Nov 10 02:09:52 2016 +0800 adding logic for save checkpoint file commit 7af92a378752ec7367f71f8cf6f9a006eaec3a9e Merge: eea3716 9ff4832 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Nov 10 02:06:18 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev Conflicts: Source/SGDLib/ASGDHelper.cpp commit eea37168e8809a4c2eeaf2a7be38352f1cbe6afb Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 9 22:27:12 2016 +0800 adding examples for Multiple Nodes commit 9ff4832f916fb3a2acc61e0d52880d96554cebb1 Author: Fei Gao <feiga@users.noreply.github.com> Date: Wed Nov 9 19:34:16 2016 +0800 Update ASGDHelper.cpp commit 392fb6512ab4fc66aa30b499fa5d796effd7e18c Author: Fei Gao <feiga@users.noreply.github.com> Date: Wed Nov 9 17:06:12 2016 +0800 Update testcases.yml commit 6491888a47193dda21e7ff2e5a76e538353475ef Author: Qiwei Ye <chivee.ye@gmail.com> Date: Wed Nov 9 16:58:31 2016 +0800 fix windows build commit b6e9aa600e22b3db7ae9862b39dc5c64f5e76a77 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 8 21:42:52 2016 +0800 removing baseline from Linux for Windows baseline commit f1c5ac2c4738925514702673e7f54a6aefb5a731 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 8 21:29:28 2016 +0800 Addressed CR comments commit c0f2fbf5da375c2f2a9819ef232663e3d9424da3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 8 20:54:50 2016 +0800 Addressed CR comments commit 9b8904390fa651a0c6b3b98f407fdffeb1ad098b Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 8 20:11:06 2016 +0800 Addressed CR comments commit 345f259190617a5ec8b7b7fc79bab259d1ae3425 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 8 19:59:19 2016 +0800 Addressed CR comments commit 53379bb248ac263a6574a0c324bd853c7cc0d8ec Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 8 19:50:04 2016 +0800 Addressed CR comments commit 0b93d7b0deb56e74237be7694324f102b17a583c Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Nov 7 19:36:30 2016 +0800 revert unexpected change commit af999a1144b7cb77e9c7c6f3275f55ee461c1943 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Nov 7 19:23:28 2016 +0800 revert makefile: libEval depends on SGDLib, which will depends on Multiverso commit 551956c310368828e7b4f3bd74d893e2509ec4d9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 6 20:47:43 2016 -0800 altering check-git-head for multiverso commit e54dfffd883765bc83734bd40fb754bc52698c4d Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 6 14:42:55 2016 +0800 add git attributes for Multiverso commit 9ce8d5c63ad2ed600b343f8fc30642d0f4d9daae Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 6 14:30:16 2016 +0800 update submodule to pass the cntk build test commit 52fb5ab2837f07ae6570d1ba4ac04d378fb20e8b Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 6 13:31:15 2016 +0800 fix testcase for e2e test commit a6d02860afc0320d5ddb1d4feaea08755bbe4b32 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 6 13:22:45 2016 +0800 CNTK.cpp: fix indentation commit 71d68c8b5ea851d3cc7976de7b8e595053c3e89d Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 6 13:11:20 2016 +0800 update makefile to latests commit f1da36427f0722b894a493399ae29b38c98cc916 Merge: 6d00cdc dd496e5 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Nov 6 12:49:20 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit 6d00cdc6d347c3e793f1eefc5742eafcd1d018b4 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Nov 4 16:49:44 2016 +0800 Revert MultiversoHelper initialize commit ff03e400d2ff735212a062e9da1459256a4c36fd Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Nov 3 17:31:28 2016 +0800 fix linux build commit 105305e589a7c53cce86ce1d37f7cb7189a35364 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Nov 3 15:00:19 2016 +0800 fix linux build commit cd445874c1c3be29bc652cde40ec9c8ce572d55d Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Nov 3 13:54:29 2016 +0800 Adding InvalidArgument check commit 0af066ba132634c58e69d478c6e0f4bd0d1ea388 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Nov 3 13:36:02 2016 +0800 changing E2E ASGD commit 6e93dfbd9c823c31059b9737f7eb3719989fb570 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 21:05:29 2016 +0800 update Multiverso to latest version commit f00d63fb592795d0920bdc0b858e8824a7f32dd0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 21:04:30 2016 +0800 code clean : cuda_call in ASGDHelper commit 8fbe99a16f9e027dbe4eb49ee71c8ff18c68111e Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 17:21:51 2016 +0800 code clean commit 00f9c482919b78227f9fdaa65bf4a2bcb9684b2a Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 16:07:46 2016 +0800 turn tracelevel to 1 for minibatch tracing commit c7697f34d93b2fc10c0effc93382fe989f2445f3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 15:31:38 2016 +0800 update E2E test baseline for ASGD commit f9f30d6f64fe08c579b36b2c149284f956d4684c Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 14:42:13 2016 +0800 updating e2e testcase commit 1ee15d0d0a7349471c868b86d17d37e5f387fdd5 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 13:20:30 2016 +0800 making e2e test running on GPU only commit 02ffd27c95d6048a36a5fed15fb213ee5a16e4ae Merge: 63764b3 7cc84c8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 11:16:38 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 63764b3e5c1da27b725395d59ce8ffd79736d0f3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Nov 2 11:15:35 2016 +0800 Using CUDA_CALL instead of CudaErrorCheck commit 7cc84c8731ffa06ecad882485b3a14f6b260c9b8 Author: Fei Gao <gf0109@gmail.com> Date: Tue Nov 1 20:13:58 2016 -0700 Fix Makefile seperator issue commit 70ca67c09b66c18057ee28ad5788e75cad2b8616 Author: Fei Gao <gf0109@gmail.com> Date: Tue Nov 1 18:52:25 2016 -0700 Fix makefile tab separator issue commit 10b40dfffa62fafe80980d8c9f3e1dc8ddfbfc62 Author: Fei Gao <gf0109@gmail.com> Date: Tue Nov 1 06:59:10 2016 -0700 Linux Build OK commit 0061178020df7dd9816f4bbf2ecd11dbd9955c9f Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 21:06:40 2016 +0800 removing unnecessary dependency; adding _CRT_SECURE_NO_WARNINGS for util class commit feb6a907e973ae9fae6358bd27f2505c54415f6d Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 20:56:21 2016 +0800 fix build commit 89197f5d806d16958a8e46d49935c0c20c50c865 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 20:54:01 2016 +0800 Revert "fix indentation: align with CNTK standard" This reverts commit ac65e14ddf371024ee808e47755e140f0e4ca22e. commit 321b20c1dec27e700b00472198d5031c7a97e248 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 20:53:50 2016 +0800 removing ASGDCommon.h commit ac65e14ddf371024ee808e47755e140f0e4ca22e Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 20:46:35 2016 +0800 fix indentation: align with CNTK standard commit 5f8e9c6385d90bc3fca6f827455d82182151f71f Merge: f8f6638 10428b1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 20:42:49 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit f8f66384c348a648a160736ddc4edcb64d910919 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 20:42:00 2016 +0800 adding baseline for ASGD e2e test commit 10428b12fbe7bf625ede9aba81f17fc5b4ac7f02 Author: feiga <gf0109@gmail.com> Date: Tue Nov 1 20:41:41 2016 +0800 Change Tab from 2 spaces to 4 spaces commit 060e9f678d3dcb1a7a7a03988e6b25de99ff02d3 Author: feiga <gf0109@gmail.com> Date: Tue Nov 1 20:36:24 2016 +0800 Update Makefile for the new added ASGDHelper.cpp file commit ce87588a268fd70826e681ac33500be1cf49e4f8 Author: feiga <gf0109@gmail.com> Date: Tue Nov 1 20:34:04 2016 +0800 Remove ASGDCommon, add ASGDHelper Interface, and move Multiverso related implementation to ASGDHelper.cpp file commit 65750afd50654f2e342aba090bdc23412bbc6c1c Author: feiga <gf0109@gmail.com> Date: Tue Nov 1 17:29:04 2016 +0800 Fix compile error commit c991c4b6f0d115be1f62298affba6e3d80baca7b Merge: 42e5ea1 565c275 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 16:31:31 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 42e5ea132827fe30e49f56b13c6d4c8ffef4db80 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 16:29:18 2016 +0800 remove unnecessary dependency; adding debug version commit 565c2751e44eca5e387bfc7ce0bf356cbbf19317 Author: feiga <gf0109@gmail.com> Date: Tue Nov 1 15:54:08 2016 +0800 update submodule commit 6b1e2cd50c10878ab66580ce539616fe8407897d Merge: 9776a03 b33e67a Author: feiga <gf0109@gmail.com> Date: Tue Nov 1 15:52:55 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 9776a03147907b9905e2456e7dbf3cb10440f7f6 Author: feiga <gf0109@gmail.com> Date: Tue Nov 1 15:52:47 2016 +0800 Add Multiverso to the project commit b33e67ac75af488d0f74cff8e387d97fb8a9cddc Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Nov 1 14:39:14 2016 +0800 fix license commit 0dbbd066d2bfcc5cfab57f35751818a80ef74942 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 31 20:40:38 2016 +0800 add comments for multiversowrapper commit 5965e19f28f2a3aff47d0a669cdd0432865ddef8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 31 13:46:10 2016 +0800 using shared_ptr instead of naked pointer; fix some typo commit 1b92176e4350aa2a6d5d495bbc6da9ecaff1b846 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 31 01:05:58 2016 +0800 code review: clean code commit 4be2822a65fc57296161fa763c51b4646b9cc6b2 Merge: 4cb911a 2afe819 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Oct 27 16:31:48 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit 4cb911acba1bfe41f2e9428e5d30b9da9b57e228 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Oct 26 16:28:32 2016 +0800 using GPU for ASGD e2e test commit 29f1ff31bdd935e6a7eddbceff333dfbb500b7bf Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Oct 26 16:09:10 2016 +0800 updating 1bit commit d9274c31e2e80212972f72ba12cbcbef0db56bfb Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Oct 26 15:50:43 2016 +0800 adding quick e2e test commit 8f843dfb7fbb47a47a410b89a06c3405118c348c Merge: 0a9f9f2 496c672 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 25 17:39:31 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit 0a9f9f2bc8b2c45f333cde443c884c7f27dbed6b Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 25 17:35:01 2016 +0800 change asgd to ASGD in configure commit 9587fa0261ff6fa63edbd363ee8006aeb25489d5 Merge: a1b7a5c 1613426 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 25 13:47:37 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit a1b7a5cec782c90be9b9f988460f49283b5e6086 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 25 11:50:58 2016 +0800 code review: removing unnecessary files/tabs commit 19844ed9ddd3376d90a75e4c0eadf504d9027db1 Merge: 4dd1625 2bc4332 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 25 11:31:42 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Makefile Source/SGDLib/SGDLib.vcxproj.filters commit 4dd16257979248133585d231244b9ab798487d82 Merge: 6143e5c 3b987c2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 18 21:29:23 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/SGDLib/SGD.cpp Source/SGDLib/SGDLib.vcxproj.filters commit 6143e5c58241961b3c756a5029be46556f63d00a Merge: a5d7b7f cc40f92 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 18 16:06:55 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-dev commit cc40f924b8c14236ac6ee219739c5092422b0d0c Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 18 16:04:59 2016 +0800 modify e2e tests for asgd training commit a5d7b7f3692ec5b5ff47a672be308af66607e54a Merge: eecce32 43c7fc8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 18 16:03:09 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: CNTK.sln commit eecce324870c00ad5f0576dd47d9660122cfb2fb Merge: 291176a 3285e38 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Oct 14 16:52:29 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 291176a7b63d6e58b752b9390718bd45fe5b5e8b Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Oct 14 16:44:14 2016 +0800 adding end-to-end test for ASGD commit 3285e3894734c53b57d5f7a66019643c650c662e Author: feiga <gf0109@gmail.com> Date: Wed Oct 12 13:07:52 2016 +0800 update submodule commit d065765a452a35720d0c7d28b145e3f14325cf04 Merge: 9944ba4 c5bd4e9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Oct 11 20:39:29 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit c5bd4e9867f9c1f76a8a3b5e97f60d12a0c6de8f Author: feiga <gf0109@gmail.com> Date: Tue Oct 11 20:58:17 2016 +0900 Update submodule commit 590a1851b9c035d1673069c626e91d39f0a0eca4 Author: feiga <gf0109@gmail.com> Date: Tue Oct 11 19:51:47 2016 +0800 Add MultiversoTests project to sln file commit 700db4c52f7e67443a9cf89b6c5c30cba0221ae3 Author: feiga <gf0109@gmail.com> Date: Tue Oct 11 19:12:35 2016 +0800 Update Multiverso submodule commit 9944ba4ce647d7435bf27796e45ecd6941351e89 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 10 20:57:44 2016 +0800 fix build issue commit 018a812f348a4dbad66020870a39185010a60599 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 10 20:50:54 2016 +0800 reverting simple evaluator for compatibility, initialing simple evaluator without m_mpi when using ASGD commit 0e443fa823f18f13fe3b630e76f4f2b1727cb0fc Merge: 926144e 2cc0338 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 10 17:21:24 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 926144ec80acf41f4225990782ece26eb011cc54 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 10 17:14:42 2016 +0800 making cross validation don't use distributed reader while using DataParallelASGD commit 2cc03381b9acb44ba07089a19372c914db6e10cb Author: feiga <gf0109@gmail.com> Date: Mon Oct 10 14:06:23 2016 +0800 SGDLib project configuration update commit ebefc5ade53ef07857838a966268bb1014b84814 Merge: 5e37b37 614a51e Author: feiga <gf0109@gmail.com> Date: Mon Oct 10 13:04:06 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 5e37b37093e0f9f2337bb1f25095427bb110b611 Author: feiga <gf0109@gmail.com> Date: Mon Oct 10 13:03:57 2016 +0800 Add Multiverso vs project file to CNTK solution commit 614a51e7fb21b8b00420c2d377be9861ae10cefd Merge: 2ed62be 5ab89ca Author: feiga <gf0109@gmail.com> Date: Mon Oct 10 12:18:26 2016 +0900 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev commit 2ed62be847989100ea1e8cfb86b25f03767b734e Author: feiga <gf0109@gmail.com> Date: Mon Oct 10 12:18:17 2016 +0900 Update Makefile commit 5ab89ca283d53e3a9143bf04f3809a48f5d2a5fd Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Oct 10 10:39:32 2016 +0800 Removing hard tabs commit 2ab22c55d792505a338d8f65a95f76d8badbdc94 Merge: e745745 5c18f2f Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Oct 9 16:02:34 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit e74574543036f6491b798fd7626696dd84ad5bc6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Oct 9 16:01:09 2016 +0800 ASGD: using ArrayTable instead of MatrixTable for less comunications commit acde6e1ab29c018b99b0b1a627b3c773e91fcdb8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Oct 9 13:16:40 2016 +0800 updating submodule for linux build commit a3c8e9bca67735c8d7f2b46be6cef9b096276fcd Merge: e87e5cd 1b9a33e Author: feiga <gf0109@gmail.com> Date: Sat Oct 8 16:52:55 2016 +0800 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev # Conflicts: # Source/Common/Include/NoMultiversoWrapper.h commit e87e5cd17be97d09b66851f95fda1b6c560a02d3 Author: feiga <gf0109@gmail.com> Date: Sat Oct 8 16:50:25 2016 +0800 Update interface of NoMultiversoWrapper commit 1b9a33ef266be9560a16b63dbb55c7d697de9150 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Oct 8 15:14:44 2016 +0800 fix 1bit build error commit e421707b03a8173b3d6c4054133219f202b1652f Author: feiga <gf0109@gmail.com> Date: Fri Sep 30 12:21:20 2016 +0900 Update Multiverso UnitTest baseline commit 15625d01e0fedfccfb8e9b0ab978880c50d0ecfc Author: feiga <gf0109@gmail.com> Date: Fri Sep 30 00:58:21 2016 +0900 Update Makefile, build Multiverso unittest along commit c3fbc6a55da5709789fcdf0c934d9e4daf522afa Author: feiga <gf0109@gmail.com> Date: Thu Sep 29 17:31:49 2016 +0900 Remove tab commit 4ec8f1c4e4c5d65bfb74121366b5a0fd44b22235 Author: feiga <gf0109@gmail.com> Date: Thu Sep 29 17:03:48 2016 +0900 Replace tab with 4 spaces commit eed2832700dbcb6004ae30600afbc033d3b78199 Author: feiga <gf0109@gmail.com> Date: Thu Sep 29 16:48:57 2016 +0900 Update Makefile commit 6e86798fd14a5d875a5558316a1e4bfd021b218e Merge: fa7e92e 6d3d641 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Sep 28 21:45:14 2016 -0700 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-dev commit fa7e92ee65924e2fa522a1daa2d31cc0ff23a147 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Sep 28 21:44:58 2016 -0700 fix building bug of 1BitSGD commit 6d3d64190b2c1a411478d7c533fd29880ba9b059 Merge: b69477a bde5187 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Sep 29 11:52:49 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit b69477acecd5e311d4b43f54f7d2ad6554744028 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Sep 29 11:43:19 2016 +0800 updating submodule to the latest one commit 3baa3850d2c10d6c69a85b2f3bf40837ff3adb7f Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Sep 28 20:38:53 2016 -0700 updating submodule : Multiverso, 1BitSGD. commit 7910ff69b1fa4a3b8323a89873e43d114878af6f Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Sep 29 11:35:23 2016 +0800 updating 1Bit submodule commit 5059e931d144b2e5bd3c24e1d5974669690d7bf2 Merge: 3d3b523 0c7443f Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Sep 29 11:05:11 2016 +0800 Merge branch 'qiwye/asgd-dev' into feiga/multiverso Conflicts: Source/SGDLib/SGD.cpp commit 0c7443f65b42f15e5ce054479596f28fc1ac736a Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Sep 29 10:56:29 2016 +0800 minor change for Multiverso commit 3d3b523e5d38ba64632a862f2e1f1693d1276742 Author: feiga <gf0109@gmail.com> Date: Wed Sep 28 18:27:40 2016 +0900 Fix the relative path to absolution path in Makefile commit 414bf2e02a489b18bf3cdcb04a03fd291d140797 Merge: 8a2e67a 732e9d6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Sep 28 10:54:51 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit d7463fe507d210cc12da7afe488517c0fd593e3f Author: feiga <gf0109@gmail.com> Date: Tue Sep 27 22:17:42 2016 +0900 Refine Makefile commit 89e53a9226ed36ae6b5d243c135cd10bb6c05d37 Author: feiga <gf0109@gmail.com> Date: Tue Sep 27 21:58:30 2016 +0900 fix Makefile commit dfc2c6cccae62406073892447093083ad932de0e Author: Fei Gao <feiga@microsoft.com> Date: Tue Sep 27 20:07:32 2016 +0800 Update Makefile commit 3ff5975e2ce10c4967ca6ee76295665ef983aa43 Author: feiga <gf0109@gmail.com> Date: Tue Sep 27 19:58:38 2016 +0900 Update Makefile commit 6b315511e4e3aaf672f7a3f97657738a1bdf600f Author: feiga <gf0109@gmail.com> Date: Tue Sep 27 19:46:26 2016 +0900 Update Makefile commit 8a2e67aba8ae16e82a71ea73c5be28f1c8ec7715 Merge: d904abe 6dc8f37 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Sep 27 17:04:03 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/1BitSGD Source/SGDLib/SGD.cpp commit d904abef4a36eae30300b8ae2772d48706587c0d Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Sep 27 17:02:03 2016 +0800 minor fix commit 50827a564d47b5180a862cca8ab358f6290c4280 Author: feiga <gf0109@gmail.com> Date: Tue Sep 27 18:00:02 2016 +0900 Remove multiverso header file dependence in SGD.h commit 516682b936ca425dfc14582baf6a2f508ceae936 Author: Fei Gao <feiga@microsoft.com> Date: Tue Sep 27 14:47:46 2016 +0800 Update Makefile commit a46ae614b1d1c00d8cfffd1b3a52cba757154d45 Author: feiga <gf0109@gmail.com> Date: Tue Sep 27 15:40:01 2016 +0900 Minor Makefile change commit b4de776657b5d452ba87f027c55a9ab0f97d8ed8 Author: feiga <gf0109@gmail.com> Date: Tue Sep 27 12:37:31 2016 +0900 Fix Makefile Multiverso link issue commit 2ae40949aec034ce6f13d20ed5d41fefc97efce8 Author: Fei Gao <gf0109@gmail.com> Date: Mon Sep 26 06:20:51 2016 -0700 Fix Makefile to solve the make failure in Jenkins commit c073fb0b173f7cd47c7a6974f7fed0b2a2f9bb88 Author: Fei Gao <gf0109@gmail.com> Date: Mon Sep 26 04:54:53 2016 -0700 Solve the multiversotests loader library path issue commit 804d79286da299f62ae43577283684e288d5dfcc Author: Fei Gao <gf0109@gmail.com> Date: Tue Sep 20 21:45:14 2016 -0700 Enable ASGD make commit f5671d86c1c981622060a2f5adf64d0ba25c4a9f Author: Fei Gao <gf0109@gmail.com> Date: Mon Sep 19 03:07:15 2016 -0700 Build with Multiverso and ASGD commit 9c3c876cb224cea7c6bccfc07f6e7b9254970b26 Author: Fei Gao <gf0109@gmail.com> Date: Mon Sep 19 00:05:59 2016 -0700 Replace tab with spaces commit b2530cfd041eaf7f176d6b3da29f98ac705ed167 Author: Fei Gao <gf0109@gmail.com> Date: Sun Sep 18 02:22:04 2016 -0700 Add Multiverso test script for TestDriver.py commit 870e4a5fc5ea1a4a3e851cf59766bd01665ce537 Author: Fei Gao <gf0109@gmail.com> Date: Sun Sep 18 02:13:38 2016 -0700 init the multiverso testing branch commit e983297f59c7a7551473ce86e75935fff3d0b239 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Sep 18 14:10:50 2016 +0800 updating submodule commit a8c7d6c041e3c15d3c61045265a07f0c49c5f5c7 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Sep 17 23:03:25 2016 -0700 merging master commit fab018435cdf306e3c9dea010cbf68c0aaee3fe6 Merge: 4106b02 d91a01b Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Sep 18 13:34:42 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/CNTK/CNTK.cpp commit 4106b0290fa6f0f9cc5625be59b6c110ec229dfc Merge: 131ab44 990cca1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Sep 18 13:33:54 2016 +0800 Merge branch 'qiwye/asgd-exp' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-exp commit d91a01b2e9e9d4e7bbf5c95bbfbb4ac71013c289 Merge: b938d9a 75eb386 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Sep 18 13:31:45 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/1BitSGD Source/SGDLib/SGD.cpp commit b938d9a6038e75b0258ba6fbc1162b96d23e822a Merge: 6299fd1 e33eeff Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Sep 13 14:34:05 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: CNTK.sln commit 6299fd1d9f2f63438a79a55ac08352cf05298b5f Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Sep 1 13:07:37 2016 +0800 merging from master commit 0d077ff59229ce55b68828a34b644d6b74f2f4f3 Merge: b965a8c 08081d2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Sep 1 12:55:44 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/SGDLib/SGD.cpp commit 131ab448a6e59c4b9fc010635db718b0e1f1491d Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Aug 26 10:48:21 2016 +0800 fix bug: perf time commit 990cca1c9b4be03d981fb86022e241a768119ff8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Aug 23 19:53:24 2016 +0800 adding lib commit 02ffa99c2c58c02323c8557d38c6be150105bd0d Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Aug 23 19:44:43 2016 +0800 updating headers commit e20626af7cb1ba845300c2e3013016bd4e7a9a65 Merge: e086965 b965a8c Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Aug 23 19:42:36 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/Multiverso commit b965a8c7a27a8ced9a1048e864b9c9f94bab43bb Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Aug 23 19:40:22 2016 +0800 updating submodule commit c5ccb2a10d5b8b499d57222328ac4a5d88eec570 Merge: eff143e d4f40dd Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Aug 23 19:35:31 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit e0869650174571062afe653919e1e35ac4cfd283 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Aug 8 15:53:24 2016 +0800 alter time perf commit 5b86ad370965619ba34bb7f50db3264614da5ce8 Merge: 4bc342e eff143e Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Aug 8 15:43:27 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp commit eff143e5babf18ffc02b780154d90d9b4a3c7826 Merge: 0cda441 c2f5a29 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Aug 8 15:40:37 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/CNTK/prebuild.bat configure commit 4bc342edcf18a58cd867d0b00cf778a364c9f20c Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Jul 27 15:23:18 2016 +0800 adding dl for link commit 0d30fa6933ec9dc4267b0b31492b45429bfd536c Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jul 26 15:57:46 2016 +0800 adding dl lib commit 83e1c23c3515032e599b9773568e9e782571c401 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jul 26 15:31:47 2016 +0800 adding -fPIC commit 0d0461c25afca39720dd199aac8c3b3c613f89a5 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jul 26 14:16:19 2016 +0800 commit the latest lib commit 38a424eb5306815de8b84cd8ee15facfac53f82b Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jul 26 14:03:05 2016 +0800 adding headers commit 07b7993300ef75f0898e9869f8c0cccf9942c7b4 Merge: 27636dc 0cda441 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jul 26 14:02:06 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/Multiverso commit 0cda44190d088f5f5e0850eb5b39ba8f0acdf487 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jul 26 13:53:19 2016 +0800 updating submodule commit 3b7e25edb4e82da2410e4ad632aa8c678d6850c9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jul 26 11:11:19 2016 +0800 remove timer for that main branch has latest timer commit 5a33a35eac26b98f6cfd33d824804a1c18735f6a Merge: fb9cded f3dec43 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jul 25 20:13:27 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/1BitSGD Source/SGDLib/SGD.cpp commit fb9cded35bcfdb88869ccff0e694eeeeb7524e01 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Jul 7 16:00:59 2016 +0800 updating submodule commit 67998341bed0728dc6057694f680a40564ad6751 Merge: 2e164ab 02bf3bd Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Jul 7 15:59:07 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/1BitSGD Source/SGDLib/SGDLib.vcxproj commit 27636dcc092f1b4bbd47bbfd98baded3d58aed40 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Jun 23 15:55:44 2016 +0800 fix build commit e2ac247ceaaea7f6e6ba44180a685ae01d989f81 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Jun 23 12:53:18 2016 +0800 updating lib commit 145144dde9cc386588a297bfb6d450be16639d74 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jun 21 22:09:30 2016 +0800 updating new lab commit 53a50b75ef35f01a801aaed9de2a939dccdf1c66 Merge: 53428e8 2e164ab Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jun 21 22:07:49 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/CNTK/CNTK.cpp Source/Common/Include/MultiversoWrapper.h Source/Multiverso Source/SGDLib/SGD.cpp Source/SGDLib/SGD.h commit 2e164ab33b9d601bb64f181a686a248d9756eb0e Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jun 21 11:25:02 2016 +0800 fix bug commit 1bf9c31ac4238c20ab9b425ead9dee18d7914028 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 20 16:31:41 2016 +0800 mege from master commit d17ff5d9ebf085dda6ec87dfa80b029d6713eeee Merge: 88883ae fee99ca Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Jun 15 20:22:12 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/CNTK/CNTK.cpp Source/SGDLib/SGD.cpp Source/SGDLib/SGD.h commit 88883aebfa34b086d5bfc0eed0929b821b0b0597 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Jun 15 20:12:42 2016 +0800 updating multiverso commit d8b1a25d713b16db7942bdab92e019de2ba0421f Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Jun 8 17:55:47 2016 +0800 change the perf stat of sim-ma commit 5981654c10c2d64937d5820017c28d7446107ef0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Jun 7 11:19:39 2016 +0800 fix bug: using col first storage for cntk buffer commit 591c679a32b9db07d951d6525bd6efd46683a3c0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 6 17:07:46 2016 +0800 fix typo commit 51f118a54a8c2ac05843e64b464750100e3ce9ba Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 6 17:01:26 2016 +0800 fix bug: adding the right option to server commit 53428e8ea3ce45966975964baa79a1ca5b90cb63 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 6 14:19:00 2016 +0800 Revert "git revert:debug" This reverts commit 76be03125400ed243c4880740c28ea7720091e4b. commit efa91bca2a973ba4d1434767c46f8eba4b48f2f1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 6 14:18:51 2016 +0800 Revert "debug info" This reverts commit 6cff37f0383161a704010a0c01038c49a390a44b. commit f07ab860aa199d53e05757e9da3e7a2c8eb98630 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 6 14:18:47 2016 +0800 Revert "debug info" This reverts commit ec71b41ccd3d37411a32c95457651231404ecfb1. commit 13f0321a40cc47a8602a8354d63b9ab6988c0676 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 6 14:18:42 2016 +0800 Revert "debug info" This reverts commit 699d60a8420dfad64cd6ff7cf7e163b246eabb36. commit 692e4f59a63d6005d291bb857fb407361e9fdc54 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Jun 6 14:18:38 2016 +0800 Revert "adding debug info" This reverts commit 7ad6f69f5e644b65d8fee426e5657eeb693a166a. commit d6a1b0ef6da93e07d98df0c6d4545d3c90d1d957 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Jun 2 18:40:01 2016 +0800 updating multiverso commit 229eaffc3fa236d0925846be1c130857a7a3bfc4 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Jun 1 18:01:01 2016 +0800 updating multiverso to support sparse update commit 7ad6f69f5e644b65d8fee426e5657eeb693a166a Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Jun 1 15:44:47 2016 +0800 adding debug info commit 699d60a8420dfad64cd6ff7cf7e163b246eabb36 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 31 22:52:47 2016 +0800 debug info commit ec71b41ccd3d37411a32c95457651231404ecfb1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 31 10:51:04 2016 +0800 debug info commit 6cff37f0383161a704010a0c01038c49a390a44b Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 21:20:32 2016 +0800 debug info commit 76be03125400ed243c4880740c28ea7720091e4b Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 20:40:20 2016 +0800 git revert:debug commit bef15d98cf663befdcb33ba5d68d55f834b571f5 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 17:03:59 2016 +0800 Revert "adding debug info" This reverts commit ef30a621401962ef93a9bbef05297a21f95caaf9. commit ef30a621401962ef93a9bbef05297a21f95caaf9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 15:36:34 2016 +0800 adding debug info commit dac1036ece3b9f86bd1ffd4088dcb2b0ee2cfe89 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 11:05:08 2016 +0800 Revert "test" This reverts commit 8d157ad51350bd044c344728ef94378edcbbf6ce. commit 8d157ad51350bd044c344728ef94378edcbbf6ce Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 10:54:46 2016 +0800 test commit 2d90c6e2d9aa0d680d0a77e4da305207a1531001 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 10:45:29 2016 +0800 Revert "test" This reverts commit 36e652806af840ff83014efe07cbd6c202fc8fa0. commit 36e652806af840ff83014efe07cbd6c202fc8fa0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 10:43:57 2016 +0800 test commit f1af69bc481cba4c4a0797e70505598ccb7736e1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 30 10:43:48 2016 +0800 removing dumpoutput commit 02598f95936a11faac1da7eda2c8607ced5625df Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu May 26 20:14:40 2016 +0800 adding debug info commit f6523ab49cf4d972737baa6dadd27c28dd672f38 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu May 26 10:49:40 2016 +0800 debug: print the matrix info commit 7601cb25086a7f6e6a5d04685dbc98a4a2a7efca Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 25 13:45:32 2016 +0800 fix bug commit bb61ca9e286f386face5d066dcc7b7eee28a89b4 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 25 13:21:25 2016 +0800 adding an counter for sparse updater commit 66995edf39fa58d4b8fabc1046487fb544c5df56 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 20:51:32 2016 +0800 Revert "adding debug info" This reverts commit 3f88d05f9b069836edd852f3840ef6e2e156e30f. commit 7cd4020c4abf221902c67a7787117bbd6c3d516d Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 20:51:08 2016 +0800 Revert "adding a debug line for libsvm reader, need revert" This reverts commit e64bb4c83df81b2240dc596ac140281fe20442d8. commit 4e4f494e16060ff008afe654f85ab6b5c9e7d5c0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 20:51:01 2016 +0800 Revert "no message" This reverts commit 62a5a958176c3305e2f281e1a9f863ccaff4e15a. commit 189deeea6fd68eec1d49fc0f5bad48778ce71249 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 20:50:53 2016 +0800 Revert "debug: need to revert" This reverts commit b229e0a640a71de03a774957511371825384f710. commit 2ce38c0f7c13e2fedbb18ff2ee469a7c79c161da Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 20:50:47 2016 +0800 Revert "convert" This reverts commit c8a520294d7b57f3f26ae6ad3bb970daafcbef1e. commit c8a520294d7b57f3f26ae6ad3bb970daafcbef1e Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 18:53:29 2016 +0800 convert commit b229e0a640a71de03a774957511371825384f710 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 18:42:21 2016 +0800 debug: need to revert commit 62a5a958176c3305e2f281e1a9f863ccaff4e15a Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 15:12:23 2016 +0800 no message commit e64bb4c83df81b2240dc596ac140281fe20442d8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 24 14:18:58 2016 +0800 adding a debug line for libsvm reader, need revert commit 3f88d05f9b069836edd852f3840ef6e2e156e30f Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 23 15:29:44 2016 +0800 adding debug info commit 218916d80bb763634914040af4df5d5e3a11860e Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 20 17:11:59 2016 +0800 change tracelevel commit f2b63fc549c02a6eb0bb19aafcc51490626b0965 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 20 16:19:12 2016 +0800 adding debug info commit c72ca0e4c11311528505028bbd30da50ea656996 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 20 13:45:45 2016 +0800 reverse commit commit fdb82ac79fdff4d3fdf1972d6b584195c59221d8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 20 13:30:24 2016 +0800 Revert "debug info" This reverts commit 86da0495d313ee04a3982ce45603aad0dab2f091. commit 86da0495d313ee04a3982ce45603aad0dab2f091 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 20 13:08:40 2016 +0800 debug info commit bb413098a67aee63172425a2340eb5ecfbed1ab8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 20 11:35:49 2016 +0800 fix size_t to int commit 7c954885f677c6e60c2253d1ce4846e77ff00faf Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 20 11:27:30 2016 +0800 adding info for model average commit 536c83e15cfecbca7df5c3baf9e6d374154c5479 Merge: af32793 98784c4 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu May 19 18:01:11 2016 +0800 Merge branch 'qiwye/asgd-exp' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-exp commit af327932805293b35a9d650d73d2a699e601fdde Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu May 19 18:00:37 2016 +0800 sparse row commit 98784c4478d89fc7e0cd4d8f407d2a7e6ab169c4 Merge: 55d9f31 2595a2f Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 18 17:27:08 2016 +0900 Merge branch 'qiwye/asgd-exp' of github.com:Microsoft/CNTK-exp-private into qiwye/asgd-exp commit 55d9f315e38db5447709d4f5ce28cb88a579407f Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 18 17:26:44 2016 +0900 fixing a bug in multiverso commit 2595a2f686988d6843228d93c1acea8fca4f8fce Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 17 11:31:59 2016 +0800 adding debug info commit 10049eaea3d36185841375ddf3082a0c74c252fd Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 17 11:26:27 2016 +0800 adding debug info commit c16efb8baf000b66479904b0c04b1cec2695c450 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 16 17:03:53 2016 +0800 updating 1bit commit 36369b1eee24476a093175a7be9fcc2643dcb58c Merge: 47867ae 6cc9b5b Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 16 17:00:34 2016 +0800 Merge branch 'qiwye/asgd-exp' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-exp commit 47867ae6c454bcc41308dad8df94f4897c1ac389 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 16 16:59:47 2016 +0800 sparse simulating commit 6cc9b5b97db7a27e2c8a9b787380e02dd43a3234 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun May 15 21:14:06 2016 +0900 updating library commit 05272367a72e681b584c7a53884ba806e5835c12 Merge: 1d75799 f1d078f Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat May 14 14:49:29 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/Common/Include/MultiversoWrapper.h commit 1d757991b403951ab73989b979720195a1cc38bb Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat May 14 14:47:44 2016 +0800 multiverso commit f1d078f3c1a4aaae82313a9241ee03d910426f17 Merge: 74068b5 b09ba68 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat May 14 14:42:20 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit 74068b5a2db9e7ef3ab3772abebfac58adcaf0b3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu May 12 16:43:14 2016 +0800 checking initialmodel commit 7b31106d522c769661facb2932a28f80023bb31f Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu May 12 13:06:48 2016 +0800 Model averaging simulation commit 68636e61fb39bb0a76cff81045868a0098e3ddb1 Merge: cd633f7 1a7ecae Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 11 16:03:06 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit cd633f7f442710e995cb67281f0b00ad90572e92 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 11 16:00:41 2016 +0800 model Averaging commit 6827bf33f5565012427508e38685ead4fa1e0cf8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 10 20:34:17 2016 +0800 adding modelAggregation commit 331c82594c262c473d147a62084ce7afc629a69b Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 9 13:10:46 2016 +0800 change the code to adaptive to the master commit 6b47558bfa8cb61e903a5247da6cd2824b90ab40 Merge: 737d507 7705b08 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 9 12:15:34 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/SGDLib/SGD.cpp Source/SGDLib/SGD.h commit 737d5079696911b4a7f4774005013a64340a4885 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon May 9 11:29:20 2016 +0800 code clean commit 22799c7283899adc9e9689d37e5512ede625fdaf Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri May 6 11:56:33 2016 +0800 fix indent commit df095f8eec1517ae700f3764a98d5ce8c15dc11f Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 4 16:51:53 2016 +0800 fix bug: traceLevel commit 19cf00f941812a438cc6e753dbde897c05ff6f73 Merge: 14b044a 4161cb6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 4 17:35:50 2016 +0900 Merge branch 'qiwye/asgd-exp' of github.com:Microsoft/CNTK-exp-private into qiwye/asgd-exp commit 14b044a8377bd4fda792267c4c938c96d4d30ce6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 4 17:35:27 2016 +0900 fixbug: PRIu64 commit 4161cb609f7390c3122ce18f8a333b3b1eebebf3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 4 15:56:52 2016 +0800 adding timer for profiling commit 0290c9a774dedb49fe544d6d9f01c3fa104fe670 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed May 4 15:10:58 2016 +0900 updating library commit 66023ffe6768805f1c8b32b26582a7a81a36d54d Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 19:55:49 2016 +0800 no message commit d192bc76904b6e6c69839cebe78773bf29715e80 Merge: ae42f3e facfb07 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 19:55:06 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: .gitmodules Source/Multiverso Source/Readers/HTKMLFReader/utterancesourcemulti.h commit facfb07322cf4b6ceb64cfc27d130f2b61db5d23 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 19:40:05 2016 +0800 updating the library commit ac5a5d4595ba01e1cf87b560f928214887814a8d Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 11:09:19 2016 +0800 adding multiverso commit 02c722564fbda883874b91104e4a5a0f723c31d4 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 11:04:00 2016 +0800 clean old version commit 5a2385373801e47bf83b3a36caae364fcf7e10ee Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 11:03:18 2016 +0800 change multiverso to public version commit 321d0c8b6770e3b7708da711baf3ddfc3d1058c7 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 10:58:57 2016 +0800 updatring 1bit-module commit 16e890ea758da3b3124cf33c1f63324c55b243d4 Merge: bffa012 1a9d19c Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue May 3 10:58:07 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/SGDLib/SGD.cpp Source/SGDLib/SGD.h configure commit bffa012ece65410075413b438cfb14a4b9586237 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Apr 28 14:31:21 2016 +0800 remove the unused ItemDefinition in CNTK and SGDLib commit 679b55df5068b4d9172024a63a7fe76a24e82805 Merge: 7ce8490 c34e358 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Apr 28 13:56:19 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/ActionsLib/ActionsLib.vcxproj Source/Readers/HTKMLFReader/utterancesourcemulti.h Source/SGDLib/SGDLib.vcxproj commit 7ce849065a15b2f9dc9471999c024d423d69c050 Merge: 9968ebd 9fea921 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Apr 18 14:29:28 2016 +0800 Merge branch 'hotfix/htkmlreader-instrument' into qiwye/asgd-dev Conflicts: Source/Readers/HTKMLFReader/utterancesourcemulti.h commit 9fea921f1c3b1d41a44f396c266fb06cbea0f38c Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Apr 18 13:34:15 2016 +0800 fix bug: using right format specifier for size_t commit ae42f3e09b28c4ce2cd1e19f1a3c26c85b21b4dd Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Apr 18 13:32:49 2016 +0800 updating format specifier for size_t commit d56db13d269495736038b5bb92b5b22b42812272 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Apr 18 13:06:38 2016 +0800 refine code for LOG commit a5973971f2537a1b25a091c433f1495a0faddcbb Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Apr 18 11:43:31 2016 +0800 fix tab indent with 4 space commit 0d1604f315211ecee3c568ca41430176fe33c9e1 Merge: 46a9955 a8b4809 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 20:13:07 2016 +0900 Merge branch 'qiwye/asgd-exp' of github.com:Microsoft/CNTK-exp-private into qiwye/asgd-exp commit 46a99553044bb141da971630d86f0d73ebe78690 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 20:12:40 2016 +0900 updating latest multiverso library for Jenkins commit a8b4809df1d3511dda47386517740b34f4d6f8cd Merge: 0b654e5 2cb35de Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 18:46:46 2016 +0800 Merge branch 'hotfix/htkmlreader-instrument' into qiwye/asgd-exp Conflicts: Source/Readers/HTKMLFReader/utterancesourcemulti.h commit 2cb35de7f5fec9054c257343ea9e86a7aa8413c3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 18:21:37 2016 +0800 updating chunking statics commit 0b654e580f90e78de0ed8d4661c3957d0fe3f7a7 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 17:28:13 2016 +0800 fix linux build commit 1a0b88be0cad597d53402c77395675cee5d1720d Merge: 147d117 9968ebd Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 17:09:34 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp commit 9968ebd25f8ae6e70e45f81cf172f4290eb599b3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 17:08:45 2016 +0800 updating 1bit submodule commit 1020a214fa57d30b14f59f9b48f1b4da84509edd Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 17:06:34 2016 +0800 fix some minor indent commit f31bd6ee91325ff21df5b1927ee0818942b22d93 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 16:41:40 2016 +0800 Revert "adding information for image reader" This reverts commit 5dd3b9bcb0e77972f8a93354323f257b509d588a. commit 81595c9017bb22ef0b5b1c4f2bf8da2b8d90c16f Merge: 5dd3b9b 4c9f918 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 16:22:25 2016 +0800 Merge branch 'master' into hotfix/htkmlreader-instrument commit edcf10c54c50cc68e45426c804fe917ee73c9eb8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 16:22:05 2016 +0800 minor indent fix commit 8f4423d0b8571e31738b30191675afb02a265c00 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 15:27:40 2016 +0800 printed timer info when tracelevel > 2 commit 3fda1d1885ad14fd2e6994f80b3602c65b31be91 Merge: 7323d7c 4c9f918 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 15:27:02 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/SGDLib/SGD.cpp commit 147d1178db7a9dbc4bb4a3512903f6aefc8a6a8c Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 12:51:37 2016 +0800 adding Log reference for Updaters commit 24327a5d01c1820b3497888b33f4edb78566735c Merge: 9d10dd0 7323d7c Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Apr 17 12:46:47 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/Multiverso commit 7323d7c519c6604fe8b23ce65df57c595fec92f6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Apr 16 19:10:11 2016 +0800 updating multiverso helper for the new matrix interface commit 97609905063fdd065fe4bb9d25b0fecc9f74fb72 Merge: 2dab90c e87b4d6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Apr 16 10:41:47 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/ActionsLib/ActionsLib.vcxproj Source/CNTK/CNTK.cpp Source/CNTK/CNTK.vcxproj Source/SGDLib/SGD.cpp Source/SGDLib/SGD.h Source/SGDLib/SGDLib.vcxproj Source/SGDLib/SGDLib.vcxproj.filters Tools/generate_build_info configure commit 2dab90ca49311856db6a52eb9974381bf8939ee7 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Apr 16 10:10:34 2016 +0800 update submodule commit 44b21f8c497f7ed73aa86a23300c9d71a9db1c5e Merge: 4aa2017 51dfd58 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Apr 16 10:09:29 2016 +0800 Merge branch 'qiwye/sparse-update' into qiwye/asgd-dev Conflicts: Source/Common/Include/MultiversoWrapper.h commit 51dfd58cad494b69db6c6897f8209c30f19b4742 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Apr 13 16:32:26 2016 +0800 sparse update support ready commit 4aa20172d957043b1bfde4d700b3bbf9136a7bd6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Apr 12 16:13:20 2016 +0800 update multiverso to latest version. commit c3fae1003a512e81b5a1628dd85061d9cdf418a1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Apr 12 14:48:37 2016 +0800 update the submodule commit 5dd3b9bcb0e77972f8a93354323f257b509d588a Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Apr 7 13:16:34 2016 +0800 adding information for image reader commit faff4ee119c028fcd9e45762b8e0b442cb7460ff Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 30 17:07:27 2016 +0800 change format to size_t commit 49c38e3cf4b0f01f1e324cf1dc37b0246a54258d Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 30 16:46:27 2016 +0800 add page in timer for htkmlreader commit 9d10dd082d26d3d2fa84b95110d643f149887b04 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 18 06:47:23 2016 +0900 updating multiverso to the latest version commit e4723cbe7da639e66ebb4a5a5c1ca5c258d15aee Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 18 05:36:00 2016 +0800 using matrixtable for the layerewise updae commit 1fa2adc09d64824f2927491c1873bc140fab3d2f Merge: a080383 2ea352e Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 18 05:32:09 2016 +0800 Merge branch 'qiwye/asgd-exp' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-exp commit a080383f3dc5d12c25a5788e74934794800883bf Merge: 0aefe86 8fc2d21 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 18 05:30:49 2016 +0800 Merge branch 'qiwye/sparse-update' into qiwye/asgd-exp Conflicts: Source/Common/Include/MultiversoWrapper.h Source/Multiverso commit 8fc2d2135dffd55d8f3e52c13814fd6fce4ce4e2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 18 05:26:57 2016 +0800 adding timer for requiredata of HTKMLFReader commit d24a383db25c5a55b76283c4582311ea2940b0b1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 18 05:26:21 2016 +0800 using matrixTable for layerwise update commit 6a9a2880879c4f2c146b1afebcd98c20a4738ed0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 18 02:51:09 2016 +0800 using matrix table for the layer-wise update commit 2ea352e4b1b9ef75d96447e5648799875fbb5e7b Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 16 04:03:17 2016 +0900 adding NO_SYNC in makefile commit f7ace8d255f9b9071655c21b847cfdfac67b1314 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Mar 15 07:42:03 2016 +0800 changing to matrix array ( incomplete) commit 2771cc61bd288fbd2a8aa38d972b48f643e89c2e Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Mar 15 06:23:21 2016 +0800 updating to latest multiverso module commit 0aefe86925bab6ecb5196cd4b694a59ab4bbe884 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Mar 10 03:20:01 2016 +0900 reverting DEBUG:TestMultiThreads commit 8083e1e28d7d33fc05ebb591b4e8e16d0b9b0d68 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Mar 10 03:07:34 2016 +0900 BUG fix: adding addtional copy for the RDMA copy in OpenMPI commit 02e8121b68518061e3bd37e29904c9d2637f3957 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Mar 4 00:04:49 2016 +0800 multiverso test: thread test commit a261872b9a56a688e80d5f0cc29b8414a945c1d4 Merge: 80c9fa1 feda2e1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Mar 3 23:30:52 2016 +0800 Merge branch 'qiwye/asgd-exp' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-exp commit 80c9fa1c55df9bac070c06cbe7a112a1d2b5e615 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Mar 3 23:29:56 2016 +0800 fix bug: parameters should init to server synchronized. commit feda2e19789b3884ec8d8ba76d6eff5dc35789c1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Mar 3 21:46:19 2016 +0900 updating multiverso lib commit 07f99ffb5c22925920065aa0805050672b898cef Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Mar 3 20:30:15 2016 +0800 adding debug informations commit cdd21a3136ff90d7c0bd06cbf892bcc4db1b950a Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 2 21:31:55 2016 +0800 Fixbug: sending msg to each client commit 2bb8f361a4cede668b6651c721c241b818c88e6b Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 2 14:52:34 2016 +0800 DEBUG:TESTNET commit c855831dba00d78ff14f0d04e98de08ddb970eda Merge: c536a5b a335f2c Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 2 01:38:56 2016 +0900 Merge branch 'qiwye/asgd-exp' of github.com:Microsoft/CNTK-exp-private into qiwye/asgd-exp commit c536a5bf95053fcac4a53fbeb607fbd081e9173d Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 2 01:38:49 2016 +0900 updating multiverso commit a335f2c4d1127ed75d5d5d254037ffccda5d99ae Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Mar 2 00:37:59 2016 +0800 Debug:TestNet commit 39f1d7628f47d7521dda8d78ad97bbee4f8a7ba2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 29 15:05:50 2016 +0800 DEBUG: Testnet commit 4e6fb134a552bd6777ffeb2b43b3a78e065ad149 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 29 14:35:01 2016 +0800 DEBUG: TestNet commit 798681077026cf808f36a389d6d6394b1f404bc6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 29 12:37:45 2016 +0900 update library for experiment commit f9d9830721a7d288754b90a9ed7fe489315ab17e Merge: 12b41c2 addc32d Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 29 11:29:17 2016 +0800 Merge branch 'qiwye/asgd-exp' of https://github.com/Microsoft/CNTK-exp-private into qiwye/asgd-exp commit 12b41c20b5082fb15fb6d5b8451a90971dda61d8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 29 11:28:19 2016 +0800 updating multiverso headers commit 5230f2536d8b4f75b9a43f0da25e7a9d5d40f8df Merge: bfeaebb 2ddf2a3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 29 11:27:01 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/Multiverso commit 2ddf2a3dcb377239718a30d80d7dba201970e72e Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 29 11:25:52 2016 +0800 updating submodule commit addc32d9f87371d04b58bf4317f8d5ffc061c7a1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Feb 28 10:39:01 2016 +0900 updating library commit bfeaebb65221a92c8968853d4190bcb39cd53c37 Merge: 9750248 15ddebf Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Feb 27 15:33:23 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/Multiverso commit 15ddebfb02803feb485eadc249facab6686c6bf3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Feb 27 15:31:21 2016 +0800 update the submodule to latest commit 97502487784ce41eb302f3514e8662f8edf52324 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Feb 26 19:11:50 2016 +0900 experiment updating commit f5fd23470eaee5f5bd7a803f1610a74ecf42a9bc Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Feb 26 18:01:30 2016 +0800 updating submodule to latest one commit 8ad04627d3c281dcbdef4190a8b0b3ea52038071 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Feb 25 21:54:35 2016 +0900 fixbug: to generate right tag for asgd support in build info commit 73b0ee90dbe05c609ce68fae163cec703479e45e Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Feb 25 16:03:16 2016 +0900 updating multiverso library to latest one commit 42b3b7a2141d39bd53c343e8e236c3bc55afe5f8 Merge: ef76b35 fb04c50 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Feb 25 14:44:48 2016 +0800 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp Conflicts: Source/Multiverso commit fb04c505d1052a93f611fa5e7895f68b189ca355 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Feb 25 14:40:12 2016 +0800 1. updating the multiverso submodule to the latest one; 2. change the config asgd using to argvector to offer more flexibility; commit 956e1bc112751ef8f8c3a9e62b2b0316e6c79a9c Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Feb 20 11:44:06 2016 +0800 updating submodule; reverting MPI THREAD SUPPORT to MPI_THREAD_SERIALIZED commit 08942320b7c2f6b35c45f8e6d2a19ac08730d5e9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Feb 18 15:02:06 2016 +0800 using unify function for config parsing commit c2548d2544a17920a1ea0e346137d0edaafc918f Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 17:20:58 2016 +0800 making CPUONLY compile succeed commit ef76b359f27eef6209e873cb31908848b1d71197 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 17:55:49 2016 +0900 temoporarily checkin for Jenkins build commit 232bf4218fba17cd644d73a0ee2b8e90b2bbf653 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 16:49:04 2016 +0800 temporarily checkin the headers commit 9969e9a0e7e5b6463957fa092ac24a10a0c0bbbb Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 16:46:55 2016 +0800 deleting submodule commit 782f51b771fee7fe5272f2e5e1ac610493bf3321 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 16:41:10 2016 +0800 delete submodule for Jenkins build commit 545bccf32d051c2769745b26cef4ca1bf85480ee Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 16:36:45 2016 +0800 updating submodule to lateset version commit 3a131dd865607daf7e3dd8547d784f83bcddd9a3 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 16:06:20 2016 +0800 using cntk buffer to to sync with parameter server to save time commit 1b9a83617f54cb38c1929699a09f5351fb8646fc Merge: 58ec1a0 d39709f Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 13:37:16 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit 58ec1a035eed3376bf89443e65f784b9603a7414 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 13:24:39 2016 +0800 update submodule to latest version commit 8a148d0f8a5cfa579ec7f914e65730699a3c6f77 Merge: 27164a6 edc2dd8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 14:15:17 2016 +0900 Merge branch 'qiwye/asgd-dev' of github.com:Microsoft/CNTK-exp-private into qiwye/asgd-dev commit 27164a64ae25c8d64975ba56092ab77219fae5d7 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 17 14:14:43 2016 +0900 change MPI init to support to MPI_THREAD_MULTIPLE commit edc2dd81e828b38c3affe348fe4e23778657f256 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 16 15:46:04 2016 +0800 adding predefine macro for linux with ASGD support commit a3cafdc8a3f1acccef31381bdd58e3134427aa8a Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 16 15:29:36 2016 +0900 debug info in actor commit fed741546148dbe4cdc593035dd5077a53ac859a Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 16 13:28:40 2016 +0800 Revert "debug check,. WARNING: should be revert later" This reverts commit da13c84d9dd73525aa4a99dbc5af0599b9d21da9. commit 8d6da277e13374b4a73efed30521fc113a565e1c Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 16 12:38:10 2016 +0800 update multiverso submodule to latest version commit da13c84d9dd73525aa4a99dbc5af0599b9d21da9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 16 11:47:37 2016 +0800 debug check,. WARNING: should be revert later commit 83a60750d7e6cd21017408d2f2ddbfc064dcd345 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 16 11:21:30 2016 +0800 Adding prebuild info for windows building commit b14d6576a2683544287a3ea6784c30aaf3e5b34c Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 15 21:01:04 2016 +0900 make gcc happy for the multiverso lib commit c2c0bea95957082b5bb09f42ae95b71ba5c56814 Merge: 492e273 11f11b1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 15 10:28:14 2016 +0800 Merge branch 'master' into qiwye/asgd-dev commit 492e2735de8593d64d93d6b11f1f30f74f2db17a Merge: f3f543f e1093b9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Feb 14 11:56:26 2016 +0800 Merge branch 'master' into qiwye/asgd-dev Conflicts: Source/ActionsLib/ActionsLib.vcxproj Source/CNTK/CNTK.cpp Source/CNTK/CNTK.vcxproj Source/SGDLib/SGD.cpp Source/SGDLib/SGDLib.vcxproj commit f3f543f2eab6502134a31305c438a5095725308a Author: Qiwei Ye <qiwye@microsoft.com> Date: Sun Feb 14 11:49:21 2016 +0800 Pass the build with IMultiverso commit 2f118375f34997647ce0c9accf19e9f2f514b60a Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 3 19:44:54 2016 +0800 Adding submodule for multiverso commit f9eda75ec2e7efddc591b05aa4cf4e7b205b7fde Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 3 19:42:43 2016 +0800 remove old multiverso commit 6fe2f8e4645d64b8f1a457b9b9090b8dec5515b5 Merge: af93aae 0e5ad89 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 3 19:31:38 2016 +0800 Merge branch 'master' into qiwye/multiverso commit af93aaeeff3c88109e03c06b0521305eb029aad7 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 3 15:43:09 2016 +0800 rename the multiversoWrapper commit f71b47a7ae76c1b061beeb86c668d6fb2d9b4500 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Feb 3 10:13:19 2016 +0800 rename multiverso wrapper commit 397614801ccedc2fc0d01346b05be0ed39f7017c Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 2 19:11:02 2016 +0800 Adding macros for the multiverso submodule commit f982d76c8deedaa7ebf9cc5ada08bb869d83542c Merge: c69c2d5 d562172 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 2 12:06:30 2016 +0800 Merge branch 'qiwye/multiverso' of https://github.com/Microsoft/CNTK-exp-private into qiwye/multiverso commit c69c2d50f23e03f311be9b5d3006cdc4bb7f928f Merge: 99cf8cb 69112d1 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Feb 2 12:04:35 2016 +0800 Merge branch 'master' into qiwye/multiverso commit d5621720d14baed3672e13f27d593b9bec1b1ff0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 1 21:15:54 2016 +0900 change default value of enable_asgd to yes for the jenkins build commit 7e616d97c5a4fb90e40ac5c4e8a407829b5444c2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 1 17:59:32 2016 +0900 adding needed library commit b2341b3378a08b389a94c1795d2bc6e81995fb01 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 1 13:02:04 2016 +0900 multiverso library update for Git-private commit 99cf8cbbbb0bf7d3bf1b4e88ec4f67fb7c6009f4 Merge: c7bfebe 931e72b Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Feb 1 11:14:55 2016 +0800 Merge branch 'master' into qiwye/multiverso Conflicts: Source/SGDLib/SGD.cpp commit c7bfebe740a261a656ab588eb8d5a82078143fe1 Merge: 7b495bd b8badf6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Jan 29 14:23:04 2016 +0800 Merge branch 'master' into qiwye/multiverso commit 7b495bdf9c635a5df4a6a0d8fc50fe511ce98e3b Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Jan 29 14:20:21 2016 +0800 change makefile for Linux work with multiverso commit 14ef928c3f983b3a32b841b2b45a741a97cd79c7 Author: Qiwei ye <qiwye@microsoft.com> Date: Thu Jan 28 23:30:00 2016 +0800 reorganized the folder structure of multiverso commit f8d0d4b182001579ae1b85aad41f7f8dc14fd1ac Merge: 659af22 3224f02 Author: Qiwei ye <qiwye@microsoft.com> Date: Thu Jan 28 22:41:07 2016 +0800 Merge branch 'master' into qiwye/multiverso Conflicts: Source/ActionsLib/ActionsLib.vcxproj Source/CNTK/CNTK.vcxproj Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj Source/EvalDll/EvalDll.vcxproj Source/SGDLib/SGDLib.vcxproj commit 659af22f61241e10b786e4908fcf1d00c50ff59c Author: Qiwei ye <qiwye@microsoft.com> Date: Thu Jan 28 22:15:30 2016 +0800 reorganize source structrue commit c7856a3c466b36a1a827af94a1e00cfccf633bc2 Author: Qiwei ye <qiwye@microsoft.com> Date: Thu Jan 28 20:51:48 2016 +0800 Addding asgd configure for linux make file commit 7ce7a510324aeed9852b1df5356ae30f080723ad Merge: b805f17 2462647 Author: Qiwei ye <qiwye@microsoft.com> Date: Mon Jan 25 21:22:09 2016 +0800 Merge branch 'master' into qiwye/multiverso commit b805f179a99db311c17ef8320ec14672f9d14fa9 Author: Qiwei ye <qiwye@microsoft.com> Date: Mon Jan 25 21:21:16 2016 +0800 code clean commit fcb9235aa82ffd88c35ed55f63b8d9bb2148e186 Merge: 6446a2f cb0b09f Author: Qiwei ye <qiwye@microsoft.com> Date: Mon Jan 25 21:17:28 2016 +0800 Merge branch 'master' into qiwye/multiverso commit 6446a2fa79af1b6a6c76a5f281e9092c7af2d093 Merge: ddf4066 26911b7 Author: Qiwei ye <qiwye@microsoft.com> Date: Mon Jan 25 16:56:12 2016 +0800 Merge branch 'master' into qiwye/multiverso Conflicts: .gitignore CNTK.sln Source/CNTK/CNTK.cpp Source/CNTK/CNTK.vcxproj Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj Source/EvalDll/EvalDll.vcxproj Source/SGDLib/SGD.cpp Source/SGDLib/SGD.h Source/SGDLib/SGDLib.vcxproj Source/SGDLib/SGDLib.vcxproj.filters commit ddf4066ee8f8c1caa68fdd8f3cc02bc931d23c9f Author: Mark Hillebrand <Mark.Hillebrand@microsoft.com> Date: Mon Jan 18 09:37:09 2016 +0100 License change commit 6769e371473b3957b2c5ead3637713023e7102be Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Jan 8 22:43:40 2016 +0900 fix close logic commit f67574520f4dff2f4d757447afecf149838f65b2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Jan 8 21:29:56 2016 +0800 fix close logic for ASGD commit 7628026b0521f7bbb9bbb7a42018a6b8d7b33014 Merge: 6c2ee1a c1c818c Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Jan 8 21:03:14 2016 +0800 Merge branch 'master' into qiwye/multiverso commit 6c2ee1aa517a72743c4c8a64ebefba26ce9e78e4 Merge: 641c75a 40ce1af Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Jan 7 16:57:09 2016 +0800 Merge branch 'master' into qiwye/multiverso Conflicts: Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj Source/SGDLib/SGDLib.vcxproj Source/SGDLib/SGDLib.vcxproj.filters commit 641c75a751fa87d2a41aa6de270a2facabd9f8df Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Jan 7 16:52:04 2016 +0800 fix close logic for ASGD commit 937816eff2d0cd2219b3db9be34f9f1ee7ba5aef Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Dec 31 17:16:10 2015 +0800 fix close logic for multiverso wrapper commit 16fea919ef63ab75f9b7f16ed43638c8dc20b0bc Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Dec 31 17:02:15 2015 +0800 fix close logic for multiverso wrapper commit a95eef383f682c34820060f5c09603e2f7ddd385 Merge: c4d2e78 d7f0c07 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 30 15:30:34 2015 +0800 Merge branch 'master' into qiwye/multiverso commit c4d2e78e3a79d319668448ca50c81dfae6d974a5 Merge: bbebed2 cd87741 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 23 10:24:09 2015 +0800 Merge branch 'master' into qiwye/multiverso commit bbebed2f0c79dd8fb499466692a8d157a17a17c0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Dec 22 14:15:14 2015 +0800 clean dlls for debug runtime commit 87a5da31cbd45b342dfc83849d2a8e2fbe1879e8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Dec 22 14:13:56 2015 +0800 adding libzmq-gd for debug commit e573c52c4e17c6dfed673bf44266e28d57c1849e Merge: c754dfe 1527b89 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Dec 22 13:43:27 2015 +0800 Merge branch 'master' into qiwye/multiverso commit c754dfebdce9972b03c9df2d6247a6ece14bba55 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Dec 22 13:36:31 2015 +0800 Adding support for CPUONLY. commit 9664daccb074958cd6ae227a21835f11dae84d4e Merge: b99f3e2 ef80d86 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Dec 19 12:43:46 2015 +0800 Merge branch 'master' into qiwye/multiverso commit b99f3e2f15aee32ce2b801ba5ffb490d0301b682 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Dec 18 12:44:58 2015 +0800 ignoring the prebuild files commit af45389a448fd71a7a65de395c8345a0432a7169 Merge: 28e3482 ebaf988 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Dec 18 12:41:57 2015 +0800 Merge branch 'shuxin/multiverso' into qiwye/multiverso commit ebaf9885eac9eb65e0225fe0bd37a2719ce12957 Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Dec 18 12:40:38 2015 +0800 Revert "Revert "adding an MPI init test in case of that MPI was initialized repeatedly"" This reverts commit 23ebe452a5e35dddfba2d08e8fb3265901bfc8af. commit 315e53a16f7116de15d81eec3d1645b10217a9ca Author: Qiwei Ye <qiwye@microsoft.com> Date: Fri Dec 18 11:33:18 2015 +0800 Revert "modify output log order" This reverts commit f4ca6734a82c80a206921c54f14a6fbb231a3398. commit 2e99b681dd367273b27782ce9cdfadee1e2b44ce Merge: f4ca673 23ebe45 Author: Shuxin Zheng (MSR Student-Person Consulting) <v-shuzhe@microsoft.com> Date: Fri Dec 18 10:49:54 2015 +0800 Merge branch 'master' into qiwye/multiverso commit f4ca6734a82c80a206921c54f14a6fbb231a3398 Author: Shuxin Zheng (MSR Student-Person Consulting) <v-shuzhe@microsoft.com> Date: Thu Dec 17 22:57:27 2015 +0800 modify output log order commit ca729cbaf5c8de2fdcc7560dc0d546fe4d25dc1a Author: Shuxin Zheng (MSR Student-Person Consulting) <v-shuzhe@microsoft.com> Date: Thu Dec 17 22:42:57 2015 +0800 fix bug - useASGD noMoreSamplesToProcess commit 28e34826a7c628cbd9fa92f766a595593f9d39ec Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Dec 17 15:57:45 2015 +0800 Adding include path for debug profile commit 66f78615d4abd8718179dd56b4d9b25c0bc542b8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Dec 17 11:54:22 2015 +0800 fix include path commit 254b45e6807e329008f8121ea2fdaf67dbd005e0 Merge: 4c6c57e 583f10e Author: Qiwei Ye <qiwye@microsoft.com> Date: Thu Dec 17 10:35:08 2015 +0800 Merge branch 'master' into qiwye/multiverso Conflicts: Source/CNTK/CNTK.vcxproj Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj Source/EvalDll/EvalDll.vcxproj Source/SGDLib/SGDLib.vcxproj Source/SGDLib/SGDLib.vcxproj.filters commit 4c6c57e1de6eada2a56c471586bb36d8e7ee1141 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 16 19:53:35 2015 +0800 updating multiverso runtime library commit 4b734d998500970930f81f0764dec95c5fd45e27 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 16 20:48:52 2015 +0900 updating multiverso lib commit 7ea900e6d9cbca52b02b1aeeba0b9641f4705dde Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 16 20:48:11 2015 +0900 using cstdint version multiverso commit 442b7bb0ad55ff9ba9e694896a0f44f5f055cf74 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 16 17:48:00 2015 +0800 make GCC happy commit 5dbfedc6095d7f5e211ff76ebb83d7f7588c00b0 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 16 15:51:16 2015 +0800 update multiverso lib commit ca145de82dae4d318a8826453e0aae92f29b92b8 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 16 15:50:52 2015 +0800 optimization for the ASGD speed. adding learningrate adjust logic commit 5002203b6f27c70eae329473304e3d73247b6241 Merge: 1d12689 4022de2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Wed Dec 16 11:05:09 2015 +0800 Merge branch 'master' into qiwye/multiverso Conflicts: MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj.filters commit 1d12689b58f23d8744a25b614a790ad904cccb6f Merge: f289152 d273078 Author: Qiwei Ye <qiwye@microsoft.com> Date: Tue Dec 15 14:31:49 2015 +0800 Merge branch 'qiwye/dev' into qiwye/multiverso commit f2891522e682a9857d3d3a86e374598aa3d1a921 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Dec 14 21:49:20 2015 +0800 fix debug build include path commit fe3bb89162705eba00b854f215e4beae383bc2e6 Author: Qiwei Ye <qiwye@microsoft.com> Date: Mon Dec 14 21:18:41 2015 +0800 fix bug commit 07e48cd667ecdd01105c1bbd8ae8460753e193b9 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Dec 12 18:27:55 2015 +0900 adding runtime libraries commit 25e2d662b5a5807afa1211604e14b594ccd9d351 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Dec 12 17:15:45 2015 +0800 adding multiverso library commit e19a4511b54dfcab68ec3d2a42390a745fc963c2 Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Dec 12 17:12:53 2015 +0800 fix function name commit 6f69c6208119d18635eaf369ed3097fe402ac85b Author: Qiwei Ye <qiwye@microsoft.com> Date: Sat Dec 12 16:54:22 2015 +0800 merging main branch into multiverso branch commit e9a0e67c0998cf295bac585a8475078c9b161783 Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 13:43:02 2016 -0800 python examples relocated commit 8a0cc02b43b7a10b2ead7ef12f7afb1f8ffa1a50 Merge: b49f220 e8eb645 Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 11:11:30 2016 -0800 Merge branch 'kedeng/beta' of https://github.com/Microsoft/CNTK into kedeng/beta commit b49f2209518f815d565131dce9a85eba2065ccf4 Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 14 11:10:45 2016 -0800 Jenkins fix commit e8eb64549f9875e4a3844ba269129b83df88da6d Author: Ke Deng <kedeng@microsoft.com> Date: Sat Nov 12 02:00:02 2016 -0800 ReaderConfig perf tweak commit 127ec79b080a6c26f44efb1021e6870e313823f1 Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 20:04:45 2016 -0800 MinibatchSource no skip commit 5cda422e93c23d27e3a8668a0a8ccc1e75f2796a Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 18:53:55 2016 -0800 MinibatchSource: Save/restore sample location when SetConfig to avoid skipping in prefetch commit 2c7017ee6e8cd1a5a0fc68b7d32e744361c9f0d5 Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 17:14:30 2016 -0800 Fix test again commit 92e8f743642d67b98c3f5bac0269d5d112c61a05 Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 16:55:54 2016 -0800 Fix Test commit 28143b8eba5a8f03a872913b71dd72a71e8c356a Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 15:52:59 2016 -0800 V2LibraryDistributionTests fix commit 4d749ec75a191e7772ab9b4f3d171590d3807dc4 Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 14:47:30 2016 -0800 Add warmStart to distributed training This change allows user to specify the number of samples to run non-distributed. Squashed commit of the following: commit 71fe40b02e790a172e904c7e9082b08699efc90f Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 14:23:59 2016 -0800 Squashed commit of the following: commit 82dc610da734c2cdddaf430df98c2fa3bf2abbd6 Merge: 67759d3 b6d69c5 Author: Project Philly <svcphil@microsoft.com> Date: Fri Nov 11 11:49:46 2016 -0800 Integrate wilrich/designLeftOvers into master commit 67759d310a9e5b59e9611d78e4453614813f89fa Author: Chris Basoglu <cbasoglu@microsoft.com> Date: Fri Nov 11 07:56:05 2016 -0800 Update README.md commit 15c0575e55b013fc63815b3e595792cf9389e49a Merge: 9d91e9f e9fb291 Author: Project Philly <svcphil@microsoft.com> Date: Fri Nov 11 05:56:38 2016 -0800 Integrate alexeyo/ReadMe-News-November-11 into master commit 9d91e9f90eac916b3193bfd19830998f80949f45 Merge: a262d5b 1be9e30 Author: Project Philly <svcphil@microsoft.com> Date: Fri Nov 11 05:51:06 2016 -0800 Integrate eldak/fixingBlockMomentum into master commit e9fb291c60dcac2abb62abbfccf221c25e7dceb5 Author: Alexey Orlov <alexeyo@microsoft.com> Date: Fri Nov 11 14:46:42 2016 +0100 Main ReadMe News, November 11, 2016 commit 1be9e30e3ada2c93680372d0a8bab85d65a753c9 Author: Eldar Akchurin <eldak@microsoft.com> Date: Mon Nov 7 13:56:34 2016 +0100 Fixing some synchronization of block momentum and distributed checkpointing commit a262d5b03303b1167b44be5f283a885ffc33e3d2 Merge: 1a44dac f150248 Author: Project Philly <svcphil@microsoft.com> Date: Fri Nov 11 03:01:39 2016 -0800 Integrate mahilleb/pr/1023 into master commit 1a44dac712bf19a19c91426244f3b0cc65451987 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Thu Nov 10 10:21:57 2016 +0100 Examples/Evaluation/CSEvalClient: bump NuGet package version commit f150248d228e75f4040541462759e5895ad3e884 Merge: 37ffe9d cbcea1b Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Fri Nov 11 09:55:22 2016 +0100 Merge remote-tracking branch 'origin/master' into mahilleb/pr/1023 commit b6d69c5866ba9a00dae1c9baa0f3684ead10b0b2 Author: Willi Richert <wilrich@microsoft.com> Date: Fri Nov 11 09:17:50 2016 +0100 Addressing CR comments commit 37ffe9dbb6ba07340946691890b4220f48c2131a Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Fri Nov 11 09:29:10 2016 +0100 Fix Windows build commit cbcea1b53448e650930448836788cc7e70c1e4df Merge: 548ec6b 8f7eb6e Author: Project Philly <svcphil@microsoft.com> Date: Thu Nov 10 16:35:28 2016 -0800 Integrate nikosk/pull997 into master commit 8f7eb6e37e8b4bf0cc2b3dd42e482b80a35c3c36 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Thu Nov 10 15:58:37 2016 -0800 removed tmp_ld_library_path from dockerfile commit 548ec6b382942f52906783e704ffad0653b8616f Merge: 47d7c03 1c2421f Author: Project Philly <svcphil@microsoft.com> Date: Thu Nov 10 14:56:05 2016 -0800 Integrate vadimma/EnsureTagCopy into master commit b1e9fcc17e33e4ef1afac0e116f28560cc5a720b Author: Nathan Luehr <nluehr@nvidia.com> Date: Thu Nov 10 13:48:10 2016 -0800 Removed "using namespace std" from basetypes.h commit 47d7c03e5cfa92f21eef62cffbc43ded14836102 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Thu Nov 10 11:06:41 2016 -0800 Don't override the shape after the expansion. commit 1c2421ff709e81569203d0a3a6daa68cf3700076 Author: Vadim Mazalov <vadimma@microsoft.com> Date: Thu Nov 10 10:16:12 2016 -0800 Ensure tags are copied in ComputationNodeBase::CopyTo commit 2cd3466b9ce8e0688a0dd5134a574b0517f6b8f4 Merge: fdcc61a 0fb5ec4 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Thu Nov 10 09:49:09 2016 -0800 Merge branch 'master' into ebarsoum/globalpooling For checkin and Jenkins. commit fdcc61a8961368269c3e3a67bc036e6be3f31862 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Thu Nov 10 09:48:16 2016 -0800 Use NDShape.unknown instead of None commit f8b5217dfcb1052e51255ead436be79db0c8cfde Author: Willi Richert <wilrich@microsoft.com> Date: Thu Nov 10 17:58:27 2016 +0100 Allow CloneMethod to be passed as string commit b326a9af94a72dd6d9e95864a4a2073b1a65b9f7 Author: Willi Richert <wilrich@microsoft.com> Date: Thu Nov 10 17:01:06 2016 +0100 Beautifying doc/code changes commit 0fb5ec40cc35e61f686c885f7ebc091759c86926 Merge: 3a5403d 6f7e43c Author: Project Philly <svcphil@microsoft.com> Date: Thu Nov 10 06:10:54 2016 -0800 Integrate zhouwang/pr899 into master commit 6f7e43c91efbfaffda21016fe84c1304ca922c3d Author: Zhou Wang <zhouwang@microsoft.com> Date: Thu Nov 10 13:35:14 2016 +0100 fix path for release_noopt configuration commit 2cae5f63712b2e76fa89f47e8c24f4996c2a7d68 Author: Zhou Wang <zhouwang@microsoft.com> Date: Thu Nov 10 12:52:29 2016 +0100 add release_noopt configuration commit 3a5403d6fcfb18763a02aacc571005f743ed1b3d Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Nov 10 11:32:07 2016 +0100 fixed graph string test commit c9ecf0e2b1e1681711dddb282d5dabcfc7e8a77c Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Fri Nov 4 16:45:02 2016 +0100 added a test for network graph commit 5a2c2bbf60062b06959a8ccce73033a9ead0101f Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Fri Nov 4 12:15:48 2016 +0100 rebase commit 5b4ff474b9e2e21a67166a84021f9676b9cb78ba Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Nov 3 12:04:31 2016 +0100 moved network graph to utils, added save as a DOT file commit 5475b6995f5e30f58acdd6690678cc518bb43bf3 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Oct 27 13:54:24 2016 +0200 updated graph build and display commit c44c93fa23230ab89241497756ea73bfaea9e9f2 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Wed Oct 26 12:17:52 2016 +0200 bug fix commit a9ac4e090a5fead73f9c8c43909817457a5d0d8d Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Tue Oct 25 20:43:04 2016 +0200 added basic network plotting commit e55cd0afa8ceef1945635399342b560e43d0d0e5 Author: Willi Richert <wilrich@microsoft.com> Date: Tue Oct 18 17:44:56 2016 +0200 Docs commit 73013e78ca0ca45a60d432ce9e6bf2bf0f7496a2 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Nov 3 12:04:31 2016 +0100 moved network graph to utils, added save as a DOT file commit 43e8581e03e9e4baac9200ebe46bd340cd6b7719 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Wed Nov 2 17:37:05 2016 +0100 merged png and string output into one function commit bf5e28b4f3e123a1899c7511aa93bd3b01c3891e Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Mon Oct 31 20:13:34 2016 +0100 added a short how-to for network graph example commit 95e0dc8d70bef1a3d659bac63d2e9877bd087353 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Oct 27 13:54:24 2016 +0200 updated graph build and display commit 0836b874d0fd8635dc81daa05ed00a2751c79567 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Wed Oct 26 12:17:52 2016 +0200 bug fix commit b6bd4cbd353d42492c6075447954f0d362894549 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Tue Oct 25 20:43:04 2016 +0200 added basic network plotting commit 6b8d5cb72cc208ec7a6530099250afead9ad21d5 Author: Willi Richert <wilrich@microsoft.com> Date: Tue Oct 18 17:44:56 2016 +0200 Docs commit ac1a9469ef93fc7b3df0bd9cd92ab73854df96e7 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Thu Nov 10 09:13:44 2016 +0100 Bump release tags to v2.0.beta3.0, v2.0.beta3.0+ in CNTK.cpp commit 74a7e0efd3ba785bf7ff243b4cf5330fa87bab2e Merge: 0110d72 2ca454b Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Wed Nov 9 19:51:26 2016 -0800 Merge branch 'master' into ebarsoum/globalpooling For checkin. commit 0110d72f440d3492699d3390e8cdacec3279fe83 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Wed Nov 9 19:50:32 2016 -0800 Check pad for global pooling. commit e081b6fab3e0b020c7ff0867fb598a28a286faaa Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:16:09 2016 -0800 whitespace commit 7bc01bf0da209a9b09f799cce494776e61defd99 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:12:59 2016 -0800 nit nit commit c84e53557c2068540d4616d437f9c842ffc9baf6 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:12:07 2016 -0800 nit commit bacc9889afe02af1bc4cbb12e89b604cfac8c7f0 Merge: 89ee379 452bd0f Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:10:05 2016 -0800 Merge branch 'nikosk/pull997' of github.com:Microsoft/CNTK into nikosk/pull997 commit 452bd0f28a56fb2303f22937403f4582a9146901 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:09:18 2016 -0800 Incorporated most CR feedback commit e2cf02a609995770e8ce06605f623d8b2fc2a3e8 Author: Amit Agarwal <amitaga@microsoft.com> Date: Tue Nov 8 14:33:07 2016 -0800 CNTK v2 library: Add binary CrossEntropy operator commit 89ee3796858a5c654370d7511f725eb211ac051b Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 15:17:09 2016 -0800 Removed accidental commit commit c406520b47352dbc68266efa347a849d7852c0da Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 13:17:08 2016 -0800 incorporated some cr feedback commit 8e5635585c27725aa3c2b82753ba51f508014bf7 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 8 18:12:49 2016 -0800 Fix merge issue. commit 78c63a43f9e94c3f297ca2c2286234eb2652d4c8 Merge: 662bebe 7199b51 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 8 17:57:32 2016 -0800 Merge wth master commit 662bebe271a7852d7395adbe2563d410ef61215d Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 8 17:31:56 2016 -0800 Update pooling shape attribute before reaching pooling node. commit a72e05b0eecee528f00fa5b18a2b547167a6fd59 Merge: 6922940 f3272f9 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 15:30:04 2016 -0800 Merge branch 'fiskio-master' into fiskio2 commit 6922940e1bf86f3eaeb03f68b91ebf556e32aa38 Merge: 646dcde 6b22d38 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 15:27:38 2016 -0800 Merge branch 'master' of https://github.com/fiskio/CNTK into fiskio2 commit f3272f9d37b9ff3add008c63aaf4dce4acc0814f Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 14:55:10 2016 -0800 Modified python paths commit ad753521dce3961c1d7d33cfcd96173a121df4cf Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 14:52:28 2016 -0800 Added readme on Dockerfiles commit 2d74d6900c064c55a5951a41ccc16dedc5ef8032 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 14:39:17 2016 -0800 Added build-arg to 1bit image commit 01929c491562cc9b770a09403d33ed6b2e58eb47 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Mon Nov 7 23:55:43 2016 -0800 Fix kernel shape in pooling node final validation. commit e680f35804971c2d7c28bc49d84e124ec5bfcdd5 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Mon Nov 7 23:16:29 2016 -0800 Initial checkin of global pooling. commit 6b22d38ea944590484a554e8bbc16a28c7304f0d Author: Marco Fiscato <marco@swifkey.com> Date: Mon Nov 7 12:12:05 2016 +0000 Python build install packages from default file list commit 2039300b61af3ae7c0eebbf183559bbde5bd2585 Author: Marco Fiscato <marco@swifkey.com> Date: Sun Nov 6 23:51:51 2016 +0000 added pandas, seaborn commit 7ad4f0f57319028434cb8a1cf15c04d120a68195 Author: Marco Fiscato <marco@swifkey.com> Date: Sun Nov 6 23:19:21 2016 +0000 added gym commit 81056ac1612681b6c94644fb8bc2193dcfd94da0 Author: Marco Fiscato <marco@swifkey.com> Date: Sat Nov 5 21:24:37 2016 +0000 Fix LD_LIBRARY_PATH commit 62ab074d2f20964a017ee09e6d35e27aed92b5ce Merge: 624f6d8 abb5aee Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Fri Nov 4 11:03:56 2016 -0700 Merge branch 'master' of https://github.com/fiskio/CNTK into fiskio-master commit abb5aeed9a230e487c424601a6dd94acd5866d99 Author: Marco Fiscato <marco@swifkey.com> Date: Fri Nov 4 12:09:59 2016 +0000 fiskio -> Microsoft commit fb0994a1e154c760a3e1c9b7c3504fc279310027 Author: Marco Fiscato <marco@swifkey.com> Date: Fri Nov 4 11:59:50 2016 +0000 Added 1bit-SGD docker file commit 4f81a1ed722167e6d858722a64ab3404b04265d4 Author: Marco Fiscato <marco@swifkey.com> Date: Thu Nov 3 23:20:20 2016 +0000 Fix CPU docker file commit f835b4095ba50abe5f3b91bb86cc0ea9776e15c7 Author: Marco Fiscato <marco@swifkey.com> Date: Thu Nov 3 15:52:49 2016 +0000 fix for python in docker commit 241d2e70537c2d38f4af9bb3e121c2fdf823ea8a Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 13:54:22 2016 -0800 Fix merged Linux build commit 997a31e5ac7132cbb33d335dada24dc041a38463 Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 13:44:01 2016 -0800 Post merge fixes commit aa93efdf90bf60849e6a0068abd3ea05da7503ab Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 11 10:18:24 2016 -0800 Squashed commits from Master commit 67759d310a9e5b59e9611d78e4453614813f89fa Author: Chris Basoglu <cbasoglu@microsoft.com> Date: Fri Nov 11 07:56:05 2016 -0800 Update README.md commit 15c0575e55b013fc63815b3e595792cf9389e49a Merge: 9d91e9f e9fb291 Author: Project Philly <svcphil@microsoft.com> Date: Fri Nov 11 05:56:38 2016 -0800 Integrate alexeyo/ReadMe-News-November-11 into master commit 9d91e9f90eac916b3193bfd19830998f80949f45 Merge: a262d5b 1be9e30 Author: Project Philly <svcphil@microsoft.com> Date: Fri Nov 11 05:51:06 2016 -0800 Integrate eldak/fixingBlockMomentum into master commit e9fb291c60dcac2abb62abbfccf221c25e7dceb5 Author: Alexey Orlov <alexeyo@microsoft.com> Date: Fri Nov 11 14:46:42 2016 +0100 Main ReadMe News, November 11, 2016 commit 1be9e30e3ada2c93680372d0a8bab85d65a753c9 Author: Eldar Akchurin <eldak@microsoft.com> Date: Mon Nov 7 13:56:34 2016 +0100 Fixing some synchronization of block momentum and distributed checkpointing commit a262d5b03303b1167b44be5f283a885ffc33e3d2 Merge: 1a44dac f150248 Author: Project Philly <svcphil@microsoft.com> Date: Fri Nov 11 03:01:39 2016 -0800 Integrate mahilleb/pr/1023 into master commit 1a44dac712bf19a19c91426244f3b0cc65451987 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Thu Nov 10 10:21:57 2016 +0100 Examples/Evaluation/CSEvalClient: bump NuGet package version commit f150248d228e75f4040541462759e5895ad3e884 Merge: 37ffe9d cbcea1b Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Fri Nov 11 09:55:22 2016 +0100 Merge remote-tracking branch 'origin/master' into mahilleb/pr/1023 commit 37ffe9dbb6ba07340946691890b4220f48c2131a Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Fri Nov 11 09:29:10 2016 +0100 Fix Windows build commit cbcea1b53448e650930448836788cc7e70c1e4df Merge: 548ec6b 8f7eb6e Author: Project Philly <svcphil@microsoft.com> Date: Thu Nov 10 16:35:28 2016 -0800 Integrate nikosk/pull997 into master commit 8f7eb6e37e8b4bf0cc2b3dd42e482b80a35c3c36 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Thu Nov 10 15:58:37 2016 -0800 removed tmp_ld_library_path from dockerfile commit 548ec6b382942f52906783e704ffad0653b8616f Merge: 47d7c03 1c2421f Author: Project Philly <svcphil@microsoft.com> Date: Thu Nov 10 14:56:05 2016 -0800 Integrate vadimma/EnsureTagCopy into master commit b1e9fcc17e33e4ef1afac0e116f28560cc5a720b Author: Nathan Luehr <nluehr@nvidia.com> Date: Thu Nov 10 13:48:10 2016 -0800 Removed "using namespace std" from basetypes.h commit 47d7c03e5cfa92f21eef62cffbc43ded14836102 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Thu Nov 10 11:06:41 2016 -0800 Don't override the shape after the expansion. commit 1c2421ff709e81569203d0a3a6daa68cf3700076 Author: Vadim Mazalov <vadimma@microsoft.com> Date: Thu Nov 10 10:16:12 2016 -0800 Ensure tags are copied in ComputationNodeBase::CopyTo commit 2cd3466b9ce8e0688a0dd5134a574b0517f6b8f4 Merge: fdcc61a 0fb5ec4 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Thu Nov 10 09:49:09 2016 -0800 Merge branch 'master' into ebarsoum/globalpooling For checkin and Jenkins. commit fdcc61a8961368269c3e3a67bc036e6be3f31862 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Thu Nov 10 09:48:16 2016 -0800 Use NDShape.unknown instead of None commit 0fb5ec40cc35e61f686c885f7ebc091759c86926 Merge: 3a5403d 6f7e43c Author: Project Philly <svcphil@microsoft.com> Date: Thu Nov 10 06:10:54 2016 -0800 Integrate zhouwang/pr899 into master commit 6f7e43c91efbfaffda21016fe84c1304ca922c3d Author: Zhou Wang <zhouwang@microsoft.com> Date: Thu Nov 10 13:35:14 2016 +0100 fix path for release_noopt configuration commit 2cae5f63712b2e76fa89f47e8c24f4996c2a7d68 Author: Zhou Wang <zhouwang@microsoft.com> Date: Thu Nov 10 12:52:29 2016 +0100 add release_noopt configuration commit 3a5403d6fcfb18763a02aacc571005f743ed1b3d Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Nov 10 11:32:07 2016 +0100 fixed graph string test commit c9ecf0e2b1e1681711dddb282d5dabcfc7e8a77c Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Fri Nov 4 16:45:02 2016 +0100 added a test for network graph commit 5a2c2bbf60062b06959a8ccce73033a9ead0101f Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Fri Nov 4 12:15:48 2016 +0100 rebase commit 5b4ff474b9e2e21a67166a84021f9676b9cb78ba Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Nov 3 12:04:31 2016 +0100 moved network graph to utils, added save as a DOT file commit 5475b6995f5e30f58acdd6690678cc518bb43bf3 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Oct 27 13:54:24 2016 +0200 updated graph build and display commit c44c93fa23230ab89241497756ea73bfaea9e9f2 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Wed Oct 26 12:17:52 2016 +0200 bug fix commit a9ac4e090a5fead73f9c8c43909817457a5d0d8d Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Tue Oct 25 20:43:04 2016 +0200 added basic network plotting commit e55cd0afa8ceef1945635399342b560e43d0d0e5 Author: Willi Richert <wilrich@microsoft.com> Date: Tue Oct 18 17:44:56 2016 +0200 Docs commit 73013e78ca0ca45a60d432ce9e6bf2bf0f7496a2 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Nov 3 12:04:31 2016 +0100 moved network graph to utils, added save as a DOT file commit 43e8581e03e9e4baac9200ebe46bd340cd6b7719 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Wed Nov 2 17:37:05 2016 +0100 merged png and string output into one function commit bf5e28b4f3e123a1899c7511aa93bd3b01c3891e Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Mon Oct 31 20:13:34 2016 +0100 added a short how-to for network graph example commit 95e0dc8d70bef1a3d659bac63d2e9877bd087353 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Thu Oct 27 13:54:24 2016 +0200 updated graph build and display commit 0836b874d0fd8635dc81daa05ed00a2751c79567 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Wed Oct 26 12:17:52 2016 +0200 bug fix commit b6bd4cbd353d42492c6075447954f0d362894549 Author: Alona Kharchenko <t-alkhar@microsoft.com> Date: Tue Oct 25 20:43:04 2016 +0200 added basic network plotting commit 6b8d5cb72cc208ec7a6530099250afead9ad21d5 Author: Willi Richert <wilrich@microsoft.com> Date: Tue Oct 18 17:44:56 2016 +0200 Docs commit ac1a9469ef93fc7b3df0bd9cd92ab73854df96e7 Author: Mark Hillebrand <mahilleb@microsoft.com> Date: Thu Nov 10 09:13:44 2016 +0100 Bump release tags to v2.0.beta3.0, v2.0.beta3.0+ in CNTK.cpp commit 74a7e0efd3ba785bf7ff243b4cf5330fa87bab2e Merge: 0110d72 2ca454b Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Wed Nov 9 19:51:26 2016 -0800 Merge branch 'master' into ebarsoum/globalpooling For checkin. commit 0110d72f440d3492699d3390e8cdacec3279fe83 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Wed Nov 9 19:50:32 2016 -0800 Check pad for global pooling. commit e081b6fab3e0b020c7ff0867fb598a28a286faaa Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:16:09 2016 -0800 whitespace commit 7bc01bf0da209a9b09f799cce494776e61defd99 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:12:59 2016 -0800 nit nit commit c84e53557c2068540d4616d437f9c842ffc9baf6 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:12:07 2016 -0800 nit commit bacc9889afe02af1bc4cbb12e89b604cfac8c7f0 Merge: 89ee379 452bd0f Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:10:05 2016 -0800 Merge branch 'nikosk/pull997' of github.com:Microsoft/CNTK into nikosk/pull997 commit 452bd0f28a56fb2303f22937403f4582a9146901 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 19:09:18 2016 -0800 Incorporated most CR feedback commit e2cf02a609995770e8ce06605f623d8b2fc2a3e8 Author: Amit Agarwal <amitaga@microsoft.com> Date: Tue Nov 8 14:33:07 2016 -0800 CNTK v2 library: Add binary CrossEntropy operator commit 89ee3796858a5c654370d7511f725eb211ac051b Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 15:17:09 2016 -0800 Removed accidental commit commit c406520b47352dbc68266efa347a849d7852c0da Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Wed Nov 9 13:17:08 2016 -0800 incorporated some cr feedback commit 8e5635585c27725aa3c2b82753ba51f508014bf7 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 8 18:12:49 2016 -0800 Fix merge issue. commit 78c63a43f9e94c3f297ca2c2286234eb2652d4c8 Merge: 662bebe 7199b51 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 8 17:57:32 2016 -0800 Merge wth master commit 662bebe271a7852d7395adbe2563d410ef61215d Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Tue Nov 8 17:31:56 2016 -0800 Update pooling shape attribute before reaching pooling node. commit a72e05b0eecee528f00fa5b18a2b547167a6fd59 Merge: 6922940 f3272f9 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 15:30:04 2016 -0800 Merge branch 'fiskio-master' into fiskio2 commit 6922940e1bf86f3eaeb03f68b91ebf556e32aa38 Merge: 646dcde 6b22d38 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 15:27:38 2016 -0800 Merge branch 'master' of https://github.com/fiskio/CNTK into fiskio2 commit f3272f9d37b9ff3add008c63aaf4dce4acc0814f Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 14:55:10 2016 -0800 Modified python paths commit ad753521dce3961c1d7d33cfcd96173a121df4cf Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 14:52:28 2016 -0800 Added readme on Dockerfiles commit 2d74d6900c064c55a5951a41ccc16dedc5ef8032 Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Tue Nov 8 14:39:17 2016 -0800 Added build-arg to 1bit image commit 01929c491562cc9b770a09403d33ed6b2e58eb47 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Mon Nov 7 23:55:43 2016 -0800 Fix kernel shape in pooling node final validation. commit e680f35804971c2d7c28bc49d84e124ec5bfcdd5 Author: Emad Barsoum <ebarsoum@microsoft.com> Date: Mon Nov 7 23:16:29 2016 -0800 Initial checkin of global pooling. commit 6b22d38ea944590484a554e8bbc16a28c7304f0d Author: Marco Fiscato <marco@swifkey.com> Date: Mon Nov 7 12:12:05 2016 +0000 Python build install packages from default file list commit 2039300b61af3ae7c0eebbf183559bbde5bd2585 Author: Marco Fiscato <marco@swifkey.com> Date: Sun Nov 6 23:51:51 2016 +0000 added pandas, seaborn commit 7ad4f0f57319028434cb8a1cf15c04d120a68195 Author: Marco Fiscato <marco@swifkey.com> Date: Sun Nov 6 23:19:21 2016 +0000 added gym commit 81056ac1612681b6c94644fb8bc2193dcfd94da0 Author: Marco Fiscato <marco@swifkey.com> Date: Sat Nov 5 21:24:37 2016 +0000 Fix LD_LIBRARY_PATH commit 62ab074d2f20964a017ee09e6d35e27aed92b5ce Merge: 624f6d8 abb5aee Author: Nikos Karampatziakis <nikosk@microsoft.com> Date: Fri Nov 4 11:03:56 2016 -0700 Merge branch 'master' of https://github.com/fiskio/CNTK into fiskio-master commit abb5aeed9a230e487c424601a6dd94acd5866d99 Author: Marco Fiscato <marco@swifkey.com> Date: Fri Nov 4 12:09:59 2016 +0000 fiskio -> Microsoft commit fb0994a1e154c760a3e1c9b7c3504fc279310027 Author: Marco Fiscato <marco@swifkey.com> Date: Fri Nov 4 11:59:50 2016 +0000 Added 1bit-SGD docker file commit 4f81a1ed722167e6d858722a64ab3404b04265d4 Author: Marco Fiscato <marco@swifkey.com> Date: Thu Nov 3 23:20:20 2016 +0000 Fix CPU docker file commit f835b4095ba50abe5f3b91bb86cc0ea9776e15c7 Author: Marco Fiscato <marco@swifkey.com> Date: Thu Nov 3 15:52:49 2016 +0000 fix for python in docker commit d5f88e7690a44be7fa2ba7acd33e33edf68b84f6 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 10 15:08:52 2016 -0800 Minor sample/test updates commit d2660530680f3eb43d53b259f21fe5da96707ce5 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 10 11:32:32 2016 -0800 Rename test cpp commit 3f78e33143c649cd70b35712102810e3eb9e745b Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 10 11:04:23 2016 -0800 Separate test into multiple files commit a43d7542ef21a7404c8bb1905f7d071c5dcc8ebf Author: Eldar Akchurin <eldak@microsoft.com> Date: Thu Nov 10 10:53:46 2016 +0100 Fixing sample position commit 18ae4d9b75f829672fa30022c988533a3f0cbbc6 Author: Eldar Akchurin <eldak@microsoft.com> Date: Thu Nov 10 10:48:17 2016 +0100 Fixing SetConfiguration and SetCurrentPosition commit 449ef5f2404db7d5b772698a897d80c8a7cce833 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 10 00:05:17 2016 -0800 Better fix to uninitialized ReaderShim ctor commit 5e04b8aa45e9acd4a290cf0e3422ae5e75167248 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 23:29:10 2016 -0800 Fix uninitalized variable in ReaderShim commit 1aca3bccdb62c91978d848fbf52003f04e16f5c2 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 21:21:20 2016 -0800 Linux Test fix #2 commit e59d02092bb3137c0e0a27c0185f57528fb0d69b Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 20:44:41 2016 -0800 Fix Linux test break commit b8047cc5762087b3b2836555d2a37f60e167aa98 Merge: 3516b4d 2ca454b Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 17:58:38 2016 -0800 Merge branch 'master' into kedeng/warmStart commit 3516b4d90a639ae4c48acd5a67cd6b51046fc120 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 17:51:15 2016 -0800 Add changes for real commit 8909e41bf8c67e0c2bf675bc2e16063e7058725e Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 17:47:00 2016 -0800 Add Release_NoOpt to V2LibraryDistributionTests.vcxproj Fix tabs in progress_print.py Restore original CifarResNet_Distributed sample, and rename warmStart sample to CifarResNet_warmStart for now commit ccb1573e9eaff1dc5248c9fca0e3953f001b9a97 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 17:33:53 2016 -0800 Add test case for MinibatchSource with warm-starting And fix div-by-0 in progress_print commit 89f3059fd47ab37cd8a7b09b726bfa339a71a274 Author: KeDengMS <kedeng@microsoft.com> Date: Wed Nov 9 14:04:51 2016 -0800 Add test for GPU warm start commit f2387d5c6c130fe4c7158dc8c7408fb9ced94d2e Merge: 3e51371 54a33a9 Author: KeDengMS <kedeng@microsoft.com> Date: Tue Nov 8 10:55:35 2016 -0800 Merge branch 'master' into kedeng/warmStart commit 3e5137181f179d4e3fe816d90f002b6886519bd1 Author: KeDengMS <kedeng@microsoft.com> Date: Tue Nov 8 10:53:10 2016 -0800 Add test to verify warm start CE matches single worker in 1-bit CPU device Fixes fo bugs and CR comments commit 3d28386190ca672aebb00a507f4fb7455d252c70 Merge: b36ba66 061be6e Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 7 14:49:15 2016 -0800 Merge branch 'master' into kedeng/warmStart commit b36ba6612184abc877a9459090786c55ebdbefd4 Author: KeDengMS <kedeng@microsoft.com> Date: Mon Nov 7 14:47:57 2016 -0800 Address CR feedbacks, default warmStart to infinite commit c15021abbd71e1e648e7de5032940813d24f021b Author: KeDengMS <kedeng@microsoft.com> Date: Sat Nov 5 00:34:59 2016 -0700 Fix test failure commit 62571ee54baaffedd5e01949e6fc4bf62c5cca88 Author: KeDengMS <kedeng@microsoft.com> Date: Sat Nov 5 00:16:20 2016 -0700 print progress with speed commit b5b7399efd47b1a6c0f7cc9caeaee15dadb455fd Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 4 22:41:59 2016 -0700 Example fixes commit afede95f0ae7f8224a06bd20da5d7eeded43aeba Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 4 18:22:14 2016 -0700 comment and docstring fixes commit ae46f39d0278b7e51462000903385532b4f1f7a8 Merge: 05dad62 624f6d8 Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 4 18:15:52 2016 -0700 Merge branch 'master' into kedeng/warmStart commit 05dad62862a869164b4eda4131d92e6f41974a5c Author: KeDengMS <kedeng@microsoft.com> Date: Fri Nov 4 18:12:42 2016 -0700 Use SWIG to handle size_t in python, api/test enhancements commit 13da037b7a99961774cca52f158507056ba9e136 Merge: cd08464 de58a63 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 3 22:31:40 2016 -0700 Merge branch 'master' into kedeng/warmStart commit cd08464e115f120f5b75f018b3fc15b1a71a070b Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 3 22:27:13 2016 -0700 Distributed python side refactor commit 623de80c64d6a1418a1aa8e19056cc13db7d44d3 Merge: 9af9115 327f6f9 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 3 10:27:30 2016 -0700 Merge branch 'master' into kedeng/warmStart commit 9af91159da237b27995a5faf1f5c55a2c589f256 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 3 10:26:39 2016 -0700 Address CR comments commit a8a694e9de99d396863db8b8f12a78c4d3c3e9d0 Author: KeDengMS <kedeng@microsoft.com> Date: Thu Nov 3 00:59:18 2016 -0700 Add support for warm start in distributed training This simplifies user code when dealing with warm start
2016-11-18 00:42:54 +03:00
$(CNTKLIBRARY_TESTS_SRC_PATH)/MinibatchSourceTest.cpp \
$(CNTKLIBRARY_TESTS_SRC_PATH)/UserDefinedFunctionTests.cpp \
2016-09-22 19:16:35 +03:00
Examples/Evaluation/CPPEvalV2Client/EvalMultithreads.cpp \
2016-06-11 22:21:15 +03:00
CNTKLIBRARY_TESTS:=$(BINDIR)/v2librarytests
CNTKLIBRARY_TESTS_OBJ := $(patsubst %.cu, $(OBJDIR)/%.o, $(patsubst %.cpp, $(OBJDIR)/%.o, $(CNTKLIBRARY_TESTS_SRC)))
2016-06-11 22:21:15 +03:00
ALL+=$(CNTKLIBRARY_TESTS)
SRC+=$(CNTKLIBRARY_TESTS_SRC)
2016-06-11 22:21:15 +03:00
$(CNTKLIBRARY_TESTS): $(CNTKLIBRARY_TESTS_OBJ) | $(CNTKLIBRARY_LIB) $(READER_LIBS)
2016-06-11 22:21:15 +03:00
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
2016-10-25 01:33:31 +03:00
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -l$(CNTKLIBRARY) $(L_READER_LIBS)
2016-06-11 22:21:15 +03:00
########################################
# CNTKLibrary distribution tests
########################################
CNTKLIBRARY_DISTRIBUTION_TESTS_SRC =\
2016-10-28 01:21:56 +03:00
$(CNTKLIBRARY_TESTS_SRC_PATH)/Common.cpp \
Tests/UnitTests/V2LibraryDistributionTests/Main.cpp \
Tests/UnitTests/V2LibraryDistributionTests/FrameModeTests.cpp \
CNTKLIBRARY_DISTRIBUTION_TESTS:=$(BINDIR)/v2librarydistributiontests
CNTKLIBRARY_DISTRIBUTION_TESTS_OBJ := $(patsubst %.cu, $(OBJDIR)/%.o, $(patsubst %.cpp, $(OBJDIR)/%.o, $(CNTKLIBRARY_DISTRIBUTION_TESTS_SRC)))
ALL+=$(CNTKLIBRARY_DISTRIBUTION_TESTS)
SRC+=$(CNTKLIBRARY_DISTRIBUTION_TESTS_SRC)
INCLUDEPATH+=$(CNTKLIBRARY_TESTS_SRC_PATH)
$(CNTKLIBRARY_DISTRIBUTION_TESTS): $(CNTKLIBRARY_DISTRIBUTION_TESTS_OBJ) | $(CNTKLIBRARY_LIB) $(READER_LIBS)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -l$(CNTKLIBRARY) $(L_READER_LIBS)
########################################
# LibEval
########################################
EVAL:=eval
SGDLIB_SRC=\
2016-11-01 16:59:10 +03:00
$(SOURCEDIR)/SGDLib/ASGDHelper.cpp \
$(SOURCEDIR)/SGDLib/Profiler.cpp \
$(SOURCEDIR)/SGDLib/SGD.cpp \
$(SOURCEDIR)/SGDLib/PostComputingActions.cpp \
2016-10-25 01:33:31 +03:00
SGDLIB_SRC+=$(CNTKLIBRARY_COMMON_SRC)
EVAL_SRC=\
$(SOURCEDIR)/EvalDll/CNTKEval.cpp \
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptEvaluator.cpp \
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptParser.cpp \
$(SOURCEDIR)/CNTK/ModelEditLanguage.cpp \
$(SOURCEDIR)/ActionsLib/EvalActions.cpp \
$(SOURCEDIR)/ActionsLib/NetworkFactory.cpp \
$(SOURCEDIR)/ActionsLib/NetworkDescriptionLanguage.cpp \
$(SOURCEDIR)/ActionsLib/SimpleNetworkBuilder.cpp \
$(SOURCEDIR)/ActionsLib/NDLNetworkBuilder.cpp \
EVAL_SRC+=$(SGDLIB_SRC)
EVAL_SRC+=$(COMPUTATION_NETWORK_LIB_SRC)
EVAL_SRC+=$(CNTK_COMMON_SRC)
EVAL_SRC+=$(SEQUENCE_TRAINING_LIB_SRC)
EVAL_OBJ:=\
$(patsubst %.cu, $(OBJDIR)/%.o, $(filter %.cu, $(EVAL_SRC))) \
$(patsubst %.pb.cc, $(OBJDIR)/%.pb.o, $(filter %.pb.cc, $(EVAL_SRC))) \
$(patsubst %.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(EVAL_SRC)))
EVAL_LIB:=$(LIBDIR)/lib$(EVAL).so
ALL_LIBS+=$(EVAL_LIB)
SRC+=$(EVAL_SRC)
$(EVAL_LIB): $(EVAL_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo Building $(EVAL_LIB) for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -l$(CNTKMATH) $(lMULTIVERSO) $(PROTOBUF_PATH)/lib/libprotobuf.a
########################################
# Eval Sample clients
########################################
EVAL_CLIENT:=$(BINDIR)/cppevalclient
EVAL_CLIENT_SRC=\
$(SOURCEDIR)/../Examples/Evaluation/CPPEvalClient/CPPEvalClient.cpp
EVAL_CLIENT_OBJ:=$(patsubst %.cpp, $(OBJDIR)/%.o, $(EVAL_CLIENT_SRC))
ALL+=$(EVAL_CLIENT)
SRC+=$(EVAL_CLIENT_SRC)
$(EVAL_CLIENT): $(EVAL_CLIENT_OBJ) | $(EVAL_LIB) $(READER_LIBS)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $(EVAL_CLIENT) for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -l$(EVAL) $(L_READER_LIBS) $(lMULTIVERSO)
2016-06-11 22:21:15 +03:00
EVAL_EXTENDED_CLIENT:=$(BINDIR)/cppevalextendedclient
2016-06-11 22:21:15 +03:00
EVAL_EXTENDED_CLIENT_SRC=\
$(SOURCEDIR)/../Examples/Evaluation/CPPEvalExtendedClient/CPPEvalExtendedClient.cpp
EVAL_EXTENDED_CLIENT_OBJ:=$(patsubst %.cpp, $(OBJDIR)/%.o, $(EVAL_EXTENDED_CLIENT_SRC))
ALL+=$(EVAL_EXTENDED_CLIENT)
SRC+=$(EVAL_EXTENDED_CLIENT_SRC)
$(EVAL_EXTENDED_CLIENT): $(EVAL_EXTENDED_CLIENT_OBJ) | $(EVAL_LIB) $(READER_LIBS)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $(EVAL_EXTENDED_CLIENT) for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -l$(EVAL) $(L_READER_LIBS) $(lMULTIVERSO)
2016-10-20 21:19:28 +03:00
########################################
# Eval V2 Sample client
########################################
EVALV2_SAMPLE_CLIENT:=$(BINDIR)/cppevalv2client
EVALV2_SAMPLE_CLIENT_SRC=\
$(SOURCEDIR)/../Examples/Evaluation/CPPEvalV2Client/CPPEvalV2Client.cpp \
$(SOURCEDIR)/../Examples/Evaluation/CPPEvalV2Client/EvalMultithreads.cpp
EVALV2_SAMPLE_CLIENT_OBJ:=$(patsubst %.cpp, $(OBJDIR)/%.o, $(EVALV2_SAMPLE_CLIENT_SRC))
ALL+=$(EVALV2_SAMPLE_CLIENT)
SRC+=$(EVALV2_SAMPLE_CLIENT_SRC)
$(EVALV2_SAMPLE_CLIENT): $(EVALV2_SAMPLE_CLIENT_OBJ) | $(CNTKLIBRARY_LIB) $(READER_LIBS)
2016-10-20 21:19:28 +03:00
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $(EVALV2_SAMPLE_CLIENT) for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH)) -o $@ $^ $(LIBS) -l$(CNTKLIBRARY) $(L_READER_LIBS)
2016-10-20 21:19:28 +03:00
########################################
# BinaryReader plugin
########################################
BINARYREADER_SRC =\
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Readers/BinaryReader/BinaryFile.cpp \
$(SOURCEDIR)/Readers/BinaryReader/BinaryReader.cpp \
$(SOURCEDIR)/Readers/BinaryReader/BinaryWriter.cpp \
BINARYREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(BINARYREADER_SRC))
BINARY_READER:= $(LIBDIR)/BinaryReader.so
#ALL_LIBS += $(BINARY_READER)
#SRC+=$(BINARYREADER_SRC)
$(BINARY_READER): $(BINARYREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
########################################
# HTKMLFReader plugin
########################################
HTKMLFREADER_SRC =\
$(SOURCEDIR)/Readers/HTKMLFReader/Exports.cpp \
$(SOURCEDIR)/Readers/HTKMLFReader/DataWriterLocal.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Readers/HTKMLFReader/HTKMLFReader.cpp \
$(SOURCEDIR)/Readers/HTKMLFReader/HTKMLFWriter.cpp \
2015-12-15 11:58:24 +03:00
HTKMLFREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(HTKMLFREADER_SRC))
2015-12-15 11:58:24 +03:00
HTKMLFREADER:=$(LIBDIR)/HTKMLFReader.so
ALL_LIBS+=$(HTKMLFREADER)
2015-12-15 11:58:24 +03:00
SRC+=$(HTKMLFREADER_SRC)
2015-12-15 11:58:24 +03:00
$(LIBDIR)/HTKMLFReader.so: $(HTKMLFREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
2016-04-28 16:50:37 +03:00
########################################
# CompositeDataReader plugin
########################################
COMPOSITEDATAREADER_SRC =\
$(SOURCEDIR)/Readers/CompositeDataReader/CompositeDataReader.cpp \
2016-04-29 14:54:54 +03:00
$(SOURCEDIR)/Readers/CompositeDataReader/Exports.cpp \
2016-04-28 16:50:37 +03:00
COMPOSITEDATAREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(COMPOSITEDATAREADER_SRC))
COMPOSITEDATAREADER:=$(LIBDIR)/CompositeDataReader.so
ALL_LIBS+=$(COMPOSITEDATAREADER)
2016-04-28 16:50:37 +03:00
SRC+=$(COMPOSITEDATAREADER_SRC)
$(LIBDIR)/CompositeDataReader.so: $(COMPOSITEDATAREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
########################################
2016-06-06 16:23:39 +03:00
# HTKDeserializers plugin
########################################
2016-06-06 16:23:39 +03:00
HTKDESERIALIZERS_SRC =\
$(SOURCEDIR)/Readers/HTKMLFReader/DataWriterLocal.cpp \
$(SOURCEDIR)/Readers/HTKMLFReader/HTKMLFWriter.cpp \
2016-06-06 16:23:39 +03:00
$(SOURCEDIR)/Readers/HTKDeserializers/ConfigHelper.cpp \
$(SOURCEDIR)/Readers/HTKDeserializers/Exports.cpp \
$(SOURCEDIR)/Readers/HTKDeserializers/HTKDataDeserializer.cpp \
$(SOURCEDIR)/Readers/HTKDeserializers/HTKMLFReader.cpp \
$(SOURCEDIR)/Readers/HTKDeserializers/MLFDataDeserializer.cpp \
2016-06-06 16:23:39 +03:00
HTKDESERIALIZERS_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(HTKDESERIALIZERS_SRC))
2016-06-06 16:23:39 +03:00
HTKDESERIALIZERS:=$(LIBDIR)/HTKDeserializers.so
ALL_LIBS+=$(HTKDESERIALIZERS)
2016-06-06 16:23:39 +03:00
SRC+=$(HTKDESERIALIZERS_SRC)
2016-06-06 16:23:39 +03:00
$(LIBDIR)/HTKDeserializers.so: $(HTKDESERIALIZERS_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
########################################
# LMSequenceReader plugin
########################################
LMSEQUENCEREADER_SRC =\
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Readers/LMSequenceReader/Exports.cpp \
$(SOURCEDIR)/Readers/LMSequenceReader/SequenceParser.cpp \
$(SOURCEDIR)/Readers/LMSequenceReader/SequenceReader.cpp \
$(SOURCEDIR)/Readers/LMSequenceReader/SequenceWriter.cpp \
LMSEQUENCEREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LMSEQUENCEREADER_SRC))
LMSEQUENCEREADER:= $(LIBDIR)/LMSequenceReader.so
ALL_LIBS+=$(LMSEQUENCEREADER)
SRC+=$(LMSEQUENCEREADER_SRC)
$(LMSEQUENCEREADER): $(LMSEQUENCEREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
########################################
# LUSequenceReader plugin
########################################
LUSEQUENCEREADER_SRC =\
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Readers/LUSequenceReader/Exports.cpp \
$(SOURCEDIR)/Readers/LUSequenceReader/DataWriterLocal.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Readers/LUSequenceReader/LUSequenceParser.cpp \
$(SOURCEDIR)/Readers/LUSequenceReader/LUSequenceReader.cpp \
$(SOURCEDIR)/Readers/LUSequenceReader/LUSequenceWriter.cpp \
LUSEQUENCEREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LUSEQUENCEREADER_SRC))
LUSEQUENCEREADER:=$(LIBDIR)/LUSequenceReader.so
ALL_LIBS+=$(LUSEQUENCEREADER)
SRC+=$(LUSEQUENCEREADER_SRC)
$(LUSEQUENCEREADER): $(LUSEQUENCEREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
########################################
# UCIFastReader plugin
########################################
UCIFASTREADER_SRC =\
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Readers/UCIFastReader/Exports.cpp \
$(SOURCEDIR)/Readers/UCIFastReader/UCIFastReader.cpp \
$(SOURCEDIR)/Readers/UCIFastReader/UCIParser.cpp \
UCIFASTREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(UCIFASTREADER_SRC))
UCIFASTREADER:=$(LIBDIR)/UCIFastReader.so
ALL_LIBS += $(UCIFASTREADER)
SRC+=$(UCIFASTREADER_SRC)
$(UCIFASTREADER): $(UCIFASTREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
########################################
# LibSVMBinaryReader plugin
########################################
LIBSVMBINARYREADER_SRC =\
$(SOURCEDIR)/Readers/LibSVMBinaryReader/Exports.cpp \
$(SOURCEDIR)/Readers/LibSVMBinaryReader/LibSVMBinaryReader.cpp \
LIBSVMBINARYREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(LIBSVMBINARYREADER_SRC))
LIBSVMBINARYREADER:=$(LIBDIR)/LibSVMBinaryReader.so
ALL_LIBS += $(LIBSVMBINARYREADER)
SRC+=$(LIBSVMBINARYREADER_SRC)
$(LIBSVMBINARYREADER): $(LIBSVMBINARYREADER_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 \
SPARSEPCREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SPARSEPCREADER_SRC))
SPARSEPCREADER:=$(LIBDIR)/SparsePCReader.so
ALL_LIBS += $(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)
########################################
# CNTKBinaryReader plugin
########################################
2016-12-01 04:29:29 +03:00
CNTKBINARYREADER_SRC =\
$(SOURCEDIR)/Readers/CNTKBinaryReader/Exports.cpp \
$(SOURCEDIR)/Readers/CNTKBinaryReader/BinaryChunkDeserializer.cpp \
$(SOURCEDIR)/Readers/CNTKBinaryReader/BinaryConfigHelper.cpp \
$(SOURCEDIR)/Readers/CNTKBinaryReader/CNTKBinaryReader.cpp \
2016-12-01 04:29:29 +03:00
CNTKBINARYREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(CNTKBINARYREADER_SRC))
2016-12-01 04:29:29 +03:00
CNTKBINARYREADER:=$(LIBDIR)/CNTKBinaryReader.so
ALL += $(CNTKBINARYREADER)
SRC+=$(CNTKBINARYREADER_SRC)
2016-12-01 04:29:29 +03:00
$(CNTKBINARYREADER): $(CNTKBINARYREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
2016-12-01 04:29:29 +03:00
2016-03-17 17:11:44 +03:00
########################################
# CNTKTextFormatReader plugin
########################################
CNTKTEXTFORMATREADER_SRC =\
$(SOURCEDIR)/Readers/CNTKTextFormatReader/Exports.cpp \
$(SOURCEDIR)/Readers/CNTKTextFormatReader/TextParser.cpp \
$(SOURCEDIR)/Readers/CNTKTextFormatReader/CNTKTextFormatReader.cpp \
$(SOURCEDIR)/Readers/CNTKTextFormatReader/TextConfigHelper.cpp \
CNTKTEXTFORMATREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(CNTKTEXTFORMATREADER_SRC))
CNTKTEXTFORMATREADER:=$(LIBDIR)/CNTKTextFormatReader.so
ALL_LIBS += $(CNTKTEXTFORMATREADER)
2016-03-17 17:11:44 +03:00
SRC+=$(CNTKTEXTFORMATREADER_SRC)
$(CNTKTEXTFORMATREADER): $(CNTKTEXTFORMATREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH)
########################################
# Kaldi plugins
########################################
ifdef KALDI_PATH
KALDI2READER_SRC = \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/Readers/Kaldi2Reader/DataReader.cpp \
$(SOURCEDIR)/Readers/Kaldi2Reader/DataWriter.cpp \
$(SOURCEDIR)/Readers/Kaldi2Reader/HTKMLFReader.cpp \
$(SOURCEDIR)/Readers/Kaldi2Reader/HTKMLFWriter.cpp \
$(SOURCEDIR)/Readers/Kaldi2Reader/KaldiSequenceTrainingDerivative.cpp \
$(SOURCEDIR)/Readers/Kaldi2Reader/UtteranceDerivativeBuffer.cpp \
KALDI2READER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(KALDI2READER_SRC))
KALDI2READER:=$(LIBDIR)/Kaldi2Reader.so
ALL_LIBS+=$(KALDI2READER)
SRC+=$(KALDI2READER_SRC)
$(KALDI2READER): $(KALDI2READER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(KALDI_LIBPATH) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(KALDI_LIBPATH) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH) $(KALDI_LIBS)
endif
2015-10-13 22:02:35 +03:00
########################################
# ImageReader plugin
########################################
ifdef OPENCV_PATH
2016-08-17 16:27:15 +03:00
ifdef BOOST_PATH
INCLUDEPATH += $(BOOST_PATH)/include
2016-02-20 04:41:40 +03:00
IMAGEREADER_LIBS_LIST := opencv_core opencv_imgproc opencv_imgcodecs
2016-02-20 04:41:40 +03:00
ifdef LIBZIP_PATH
CPPFLAGS += -DUSE_ZIP
# Both directories are needed for building libzip
INCLUDEPATH += $(LIBZIP_PATH)/include $(LIBZIP_PATH)/lib/libzip/include
2016-09-28 12:31:03 +03:00
LIBPATH += $(LIBZIP_PATH)/lib
IMAGEREADER_LIBS_LIST += zip
2016-02-20 04:41:40 +03:00
endif
IMAGEREADER_LIBS:= $(addprefix -l,$(IMAGEREADER_LIBS_LIST))
2015-10-13 22:02:35 +03:00
IMAGEREADER_SRC =\
2016-09-30 17:27:53 +03:00
$(SOURCEDIR)/Readers/ImageReader/Base64ImageDeserializer.cpp \
$(SOURCEDIR)/Readers/ImageReader/ImageDeserializerBase.cpp \
2016-02-25 21:48:13 +03:00
$(SOURCEDIR)/Readers/ImageReader/Exports.cpp \
$(SOURCEDIR)/Readers/ImageReader/ImageConfigHelper.cpp \
$(SOURCEDIR)/Readers/ImageReader/ImageDataDeserializer.cpp \
$(SOURCEDIR)/Readers/ImageReader/ImageTransformers.cpp \
$(SOURCEDIR)/Readers/ImageReader/ImageReader.cpp \
$(SOURCEDIR)/Readers/ImageReader/ZipByteReader.cpp \
2015-12-15 11:58:24 +03:00
2015-10-13 22:02:35 +03:00
IMAGEREADER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(IMAGEREADER_SRC))
IMAGEREADER:=$(LIBDIR)/ImageReader.so
ALL_LIBS += $(IMAGEREADER)
2015-10-13 22:02:35 +03:00
SRC+=$(IMAGEREADER_SRC)
INCLUDEPATH += $(OPENCV_PATH)/include
2016-02-01 15:10:43 +03:00
LIBPATH += $(OPENCV_PATH)/lib $(OPENCV_PATH)/release/lib
2015-10-13 22:02:35 +03:00
$(IMAGEREADER): $(IMAGEREADER_OBJ) | $(CNTKMATH_LIB)
@echo $(SEPARATOR)
2016-10-12 21:51:17 +03:00
$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH) $(IMAGEREADER_LIBS)
2015-10-13 22:02:35 +03:00
endif
2016-08-17 16:27:15 +03:00
endif
2015-10-13 22:02:35 +03:00
########################################
# 1bit SGD setup
########################################
ifeq ("$(CNTK_ENABLE_1BitSGD)","true")
ifeq (,$(wildcard Source/1BitSGD/*.h))
$(error Build with 1bit-SGD was requested but cannot find the code. Please check https://github.com/Microsoft/CNTK/wiki/Enabling-1bit-SGD for instructions)
endif
INCLUDEPATH += $(SOURCEDIR)/1BitSGD
2016-04-19 02:18:49 +03:00
COMMON_FLAGS += -DCNTK_PARALLEL_TRAINING_SUPPORT
# temporarily adding to 1bit, need to work with others to fix it
endif
2016-09-19 13:07:15 +03:00
########################################
# ASGD(multiverso) setup
########################################
2016-09-27 06:37:31 +03:00
ifeq ("$(CNTK_ENABLE_ASGD)","true")
2016-02-15 15:01:04 +03:00
ifeq (,$(wildcard Source/Multiverso/include/multiverso/*.h))
$(error Build with Multiverso was requested but cannot find the code. Please check https://github.com/Microsoft/CNTK/wiki/Multiple-GPUs-and-machines#24-data-parallel-asgd to learn more.)
endif
2016-10-10 06:18:17 +03:00
lMULTIVERSO:=-lmultiverso
2016-09-27 06:37:31 +03:00
2016-09-19 13:07:15 +03:00
INCLUDEPATH += $(SOURCEDIR)/Multiverso/include
2016-11-03 12:31:28 +03:00
COMMON_FLAGS += -DASGD_PARALLEL_SUPPORT
2016-09-19 13:07:15 +03:00
MULTIVERSO_LIB:=$(LIBDIR)/libmultiverso.so
2016-11-06 08:11:20 +03:00
ALL_LIBS+=$(MULTIVERSO_LIB)
ifeq ("$(BUILDTYPE)","release")
2016-11-08 14:59:19 +03:00
MULTIVERSO_CMAKE_BUILDTYPE=Release
endif
ifeq ("$(BUILDTYPE)","debug")
2016-11-08 14:59:19 +03:00
MULTIVERSO_CMAKE_BUILDTYPE=Debug
endif
# TODO need to align Multiverso OpenMP with the one we use (libiomp). For now, disabled.
$(MULTIVERSO_LIB):
2016-11-02 04:52:25 +03:00
@echo "Build Multiverso lib"
@mkdir -p $(LIBDIR)
@mkdir -p $(BINDIR)
2016-11-08 14:59:19 +03:00
@mkdir -p $(SOURCEDIR)/Multiverso/build/$(BUILDTYPE)
2016-11-02 04:52:25 +03:00
@cmake -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DOpenMP_CXX_FLAGS="" \
-DOpenMP_C_FLAGS="" \
2016-11-02 04:52:25 +03:00
-DBoost_NO_BOOST_CMAKE=TRUE \
-DBoost_NO_SYSTEM_PATHS=TRUE \
-DBOOST_ROOT:PATHNAME=$(BOOST_PATH) \
-DBOOST_LIBRARY_DIRS:FILEPATH=$(BOOST_PATH) \
-DLIBRARY_OUTPUT_PATH=$(shell readlink -f $(LIBDIR)) \
-DEXECUTABLE_OUTPUT_PATH=$(shell readlink -f $(BINDIR)) \
2016-11-08 14:59:19 +03:00
-DCMAKE_BUILD_TYPE=$(MULTIVERSO_CMAKE_BUILDTYPE) \
-B./Source/Multiverso/build/$(BUILDTYPE) -H./Source/Multiverso
@make VERBOSE=1 -C ./Source/Multiverso/build/$(BUILDTYPE) -j multiverso
2016-02-15 15:01:04 +03:00
2016-10-10 06:18:17 +03:00
UNITTEST_MULTIVERSO_SRC = \
$(SOURCEDIR)/Multiverso/Test/unittests/test_array.cpp \
$(SOURCEDIR)/Multiverso/Test/unittests/test_blob.cpp \
$(SOURCEDIR)/Multiverso/Test/unittests/test_kv.cpp \
$(SOURCEDIR)/Multiverso/Test/unittests/test_message.cpp \
$(SOURCEDIR)/Multiverso/Test/unittests/test_multiverso.cpp \
$(SOURCEDIR)/Multiverso/Test/unittests/test_node.cpp \
$(SOURCEDIR)/Multiverso/Test/unittests/test_sync.cpp \
UNITTEST_MULTIVERSO_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(UNITTEST_MULTIVERSO_SRC))
UNITTEST_MULTIVERSO := $(BINDIR)/multiversotests
ALL += $(UNITTEST_MULTIVERSO)
$(UNITTEST_MULTIVERSO): $(UNITTEST_MULTIVERSO_OBJ) | $(MULTIVERSO_LIB)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(ORIGINLIBDIR) $(BOOSTLIB_PATH)) -o $@ $^ $(BOOSTLIBS) $(lMULTIVERSO) -ldl
endif
########################################
# cntk
########################################
CNTK_SRC =\
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/CNTK/CNTK.cpp \
$(SOURCEDIR)/CNTK/ModelEditLanguage.cpp \
$(SOURCEDIR)/CNTK/tests.cpp \
$(SOURCEDIR)/ActionsLib/TrainActions.cpp \
$(SOURCEDIR)/ActionsLib/EvalActions.cpp \
$(SOURCEDIR)/ActionsLib/OtherActions.cpp \
$(SOURCEDIR)/ActionsLib/SpecialPurposeActions.cpp \
$(SOURCEDIR)/ActionsLib/NetworkFactory.cpp \
$(SOURCEDIR)/ActionsLib/NetworkDescriptionLanguage.cpp \
$(SOURCEDIR)/ActionsLib/SimpleNetworkBuilder.cpp \
$(SOURCEDIR)/ActionsLib/NDLNetworkBuilder.cpp \
2015-12-15 11:58:24 +03:00
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptEvaluator.cpp \
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptParser.cpp \
CNTK_SRC+=$(SGDLIB_SRC)
2016-06-11 22:21:15 +03:00
CNTK_SRC+=$(CNTK_COMMON_SRC)
CNTK_SRC+=$(COMPUTATION_NETWORK_LIB_SRC)
CNTK_SRC+=$(SEQUENCE_TRAINING_LIB_SRC)
CNTK_OBJ :=\
$(patsubst %.cu, $(OBJDIR)/%.o, $(filter %.cu, $(CNTK_SRC))) \
$(patsubst %.pb.cc, $(OBJDIR)/%.pb.o, $(filter %.pb.cc, $(CNTK_SRC))) \
$(patsubst %.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(CNTK_SRC)))
CNTK:=$(BINDIR)/cntk
ALL+=$(CNTK)
SRC+=$(CNTK_SRC)
$(CNTK): $(CNTK_OBJ) | $(READER_LIBS) $(MULTIVERSO_LIB)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
2016-10-25 01:33:31 +03:00
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH)) $(patsubst %,$(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH)) -o $@ $^ $(LIBS) $(L_READER_LIBS) $(lMULTIVERSO) -fopenmp $(PROTOBUF_PATH)/lib/libprotobuf.a
# deployable resources: standard library of BS
CNTK_CORE_BS:=$(BINDIR)/cntk.core.bs
ALL += $(CNTK_CORE_BS)
$(CNTK_CORE_BS): $(SOURCEDIR)/CNTK/BrainScript/CNTKCoreLib/CNTK.core.bs
@mkdir -p $(dir $@)
@echo bin-placing deployable resource files
cp -f $^ $@
########################################
# Unit Tests
########################################
# only build unit tests when Boost is available
ifdef BOOST_PATH
INCLUDEPATH += $(BOOST_PATH)/include
BOOSTLIB_PATH = $(BOOST_PATH)/lib
BOOSTLIBS := -lboost_unit_test_framework -lboost_filesystem -lboost_system
UNITTEST_EVAL_SRC = \
$(SOURCEDIR)/../Tests/UnitTests/EvalTests/EvalExtendedTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/EvalTests/stdafx.cpp
UNITTEST_EVAL_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(UNITTEST_EVAL_SRC))
UNITTEST_EVAL := $(BINDIR)/evaltests
ALL += $(UNITTEST_EVAL)
SRC += $(UNITTEST_EVAL_SRC)
$(UNITTEST_EVAL) : $(UNITTEST_EVAL_OBJ) | $(EVAL_LIB) $(READER_LIBS)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH) $(BOOSTLIB_PATH)) -o $@ $^ $(BOOSTLIBS) $(LIBS) -l$(EVAL) $(L_READER_LIBS) $(lMULTIVERSO)
#TODO: create project specific makefile or rules to avoid adding project specific path to the global path
INCLUDEPATH += $(SOURCEDIR)/Readers/CNTKTextFormatReader
UNITTEST_READER_SRC = \
2016-12-01 04:29:29 +03:00
$(SOURCEDIR)/../Tests/UnitTests/ReaderTests/CNTKBinaryReaderTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/ReaderTests/CNTKTextFormatReaderTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/ReaderTests/HTKLMFReaderTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/ReaderTests/ImageReaderTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/ReaderTests/ReaderLibTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/ReaderTests/stdafx.cpp \
$(SOURCEDIR)/Readers/CNTKTextFormatReader/TextParser.cpp \
UNITTEST_READER_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(UNITTEST_READER_SRC))
UNITTEST_READER := $(BINDIR)/readertests
ALL += $(UNITTEST_READER)
SRC += $(UNITTEST_READER_SRC)
$(UNITTEST_READER): $(UNITTEST_READER_OBJ) | $(HTKMLFREADER) $(HTKDESERIALIZERS) $(UCIFASTREADER) $(COMPOSITEDATAREADER) $(IMAGEREADER) $(READER_LIBS)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(ORIGINLIBDIR) $(BOOSTLIB_PATH)) -o $@ $^ $(BOOSTLIBS) $(L_READER_LIBS) -ldl
UNITTEST_NETWORK_SRC = \
$(SOURCEDIR)/../Tests/UnitTests/NetworkTests/AccumulatorNodeTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/NetworkTests/CropNodeTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/NetworkTests/OperatorEvaluation.cpp \
$(SOURCEDIR)/../Tests/UnitTests/NetworkTests/stdafx.cpp \
$(SOURCEDIR)/../Tests/UnitTests/NetworkTests/TestHelpers.cpp \
$(SOURCEDIR)/CNTK/ModelEditLanguage.cpp \
$(SOURCEDIR)/ActionsLib/TrainActions.cpp \
$(SOURCEDIR)/ActionsLib/EvalActions.cpp \
$(SOURCEDIR)/ActionsLib/OtherActions.cpp \
$(SOURCEDIR)/ActionsLib/SpecialPurposeActions.cpp \
$(SOURCEDIR)/ActionsLib/NetworkFactory.cpp \
$(SOURCEDIR)/ActionsLib/NetworkDescriptionLanguage.cpp \
$(SOURCEDIR)/ActionsLib/SimpleNetworkBuilder.cpp \
$(SOURCEDIR)/ActionsLib/NDLNetworkBuilder.cpp \
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptEvaluator.cpp \
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptParser.cpp \
UNITTEST_NETWORK_SRC += $(COMPUTATION_NETWORK_LIB_SRC)
UNITTEST_NETWORK_SRC += $(CNTK_COMMON_SRC)
UNITTEST_NETWORK_SRC += $(SEQUENCE_TRAINING_LIB_SRC)
UNITTEST_NETWORK_SRC += $(SGDLIB_SRC)
UNITTEST_NETWORK_OBJ :=\
$(patsubst %.cu, $(OBJDIR)/%.o, $(filter %.cu, $(UNITTEST_NETWORK_SRC))) \
$(patsubst %.pb.cc, $(OBJDIR)/%.pb.o, $(filter %.pb.cc, $(UNITTEST_NETWORK_SRC))) \
$(patsubst %.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(UNITTEST_NETWORK_SRC)))
UNITTEST_NETWORK := $(BINDIR)/networktests
ALL += $(UNITTEST_NETWORK)
SRC += $(UNITTEST_NETWORK_SRC)
$(UNITTEST_NETWORK): $(UNITTEST_NETWORK_OBJ) | $(READER_LIBS) $(CNTKTEXTFORMATREADER) $(MULTIVERSO_LIB)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH) $(BOOSTLIB_PATH)) -o $@ $^ $(BOOSTLIBS) $(LIBS) $(lMULTIVERSO) $(L_READER_LIBS) -fopenmp $(PROTOBUF_PATH)/lib/libprotobuf.a
UNITTEST_MATH_SRC = \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/BatchNormalizationEngineTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/BlockMultiplierTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/constants.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/ConvolutionEngineTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/CPUMatrixTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/CPUSparseMatrixTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/fixtures.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/QuantizersTests.cpp \
2016-11-17 05:20:50 +03:00
$(SOURCEDIR)/../Tests/UnitTests/MathTests/QuantizedOperationsTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/TensorTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/GPUMatrixCudaBlasTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/GPUMatrixTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/GPUSparseMatrixTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/MatrixBlasTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/MatrixDataSynchronizationTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/MatrixFileWriteReadTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/MatrixQuantizerTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/MatrixSparseDenseInteractionsTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/MatrixTests.cpp \
$(SOURCEDIR)/../Tests/UnitTests/MathTests/stdafx.cpp \
UNITTEST_MATH_OBJ := $(patsubst %.cpp, $(OBJDIR)/%.o, $(UNITTEST_MATH_SRC))
UNITTEST_MATH := $(BINDIR)/mathtests
ALL += $(UNITTEST_MATH)
SRC += $(UNITTEST_MATH_SRC)
$(UNITTEST_MATH): $(UNITTEST_MATH_OBJ) | $(READER_LIBS)
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH) $(BOOSTLIB_PATH)) -o $@ $^ $(BOOSTLIBS) $(LIBS) $(L_READER_LIBS) -ldl -fopenmp
2016-08-02 10:18:08 +03:00
UNITTEST_BRAINSCRIPT_SRC = \
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptEvaluator.cpp \
$(SOURCEDIR)/CNTK/BrainScript/BrainScriptParser.cpp \
$(SOURCEDIR)/../Tests/UnitTests/BrainScriptTests/ParserTests.cpp \
2016-08-09 12:31:47 +03:00
$(SOURCEDIR)/../Tests/UnitTests/BrainScriptTests/ComputationNetworkTests.cpp \
2016-08-02 10:18:08 +03:00
$(SOURCEDIR)/../Tests/UnitTests/BrainScriptTests/stdafx.cpp
2016-08-09 12:31:47 +03:00
UNITTEST_BRAINSCRIPT_SRC += $(COMPUTATION_NETWORK_LIB_SRC)
UNITTEST_BRAINSCRIPT_SRC += $(SEQUENCE_TRAINING_LIB_SRC)
2016-08-02 10:18:08 +03:00
2016-08-09 12:31:47 +03:00
UNITTEST_BRAINSCRIPT_OBJ := $(patsubst %.cu, $(OBJDIR)/%.o, $(patsubst %.cpp, $(OBJDIR)/%.o, $(UNITTEST_BRAINSCRIPT_SRC)))
2016-08-02 10:18:08 +03:00
UNITTEST_BRAINSCRIPT := $(BINDIR)/brainscripttests
ALL += $(UNITTEST_BRAINSCRIPT)
SRC += $(UNITTEST_BRAINSCRIPT_SRC)
$(UNITTEST_BRAINSCRIPT): $(UNITTEST_BRAINSCRIPT_OBJ) | $(READER_LIBS)
2016-08-02 10:18:08 +03:00
@echo $(SEPARATOR)
@mkdir -p $(dir $@)
@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(GDK_NVML_LIB_PATH) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(ORIGINLIBDIR) $(LIBPATH) $(BOOSTLIB_PATH)) -o $@ $^ $(BOOSTLIBS) $(LIBS) -ldl $(L_READER_LIBS)
2016-08-02 10:18:08 +03:00
unittests: $(UNITTEST_EVAL) $(UNITTEST_READER) $(UNITTEST_NETWORK) $(UNITTEST_MATH) $(UNITTEST_BRAINSCRIPT)
endif
2016-10-12 21:51:17 +03:00
# For now only build Release.
ifeq ("$(PYTHON_SUPPORT) $(BUILDTYPE)","true release")
# Libraries needed for the run-time (i.e., excluding test binaries)
# TODO MPI doesn't appear explicitly here, hidden by mpic++ usage (but currently, it should be user installed)
RUNTIME_LIBS_LIST := $(LIBS_LIST) $(IMAGEREADER_LIBS_LIST) $(KALDI_LIBS_LIST)
RUNTIME_LIBS_EXCLUDE_LIST := m pthread nvidia-ml
EXTRA_LIBS_BASENAMES:=$(addsuffix .so,$(addprefix lib,$(filter-out $(RUNTIME_LIBS_EXCLUDE_LIST),$(RUNTIME_LIBS_LIST))))
# TODO dependencies
# TODO intermediate build results should go below $OBJDIR
.PHONY: python
python: $(ALL_LIBS)
@bash -c '\
set -x -e; \
declare -A py_paths; \
2016-12-19 15:49:05 +03:00
py_paths[27]=$(PYTHON27_PATH); \
py_paths[34]=$(PYTHON34_PATH); \
py_paths[35]=$(PYTHON35_PATH); \
2016-11-10 06:16:09 +03:00
export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$(echo $(GDK_NVML_LIB_PATH) $(LIBPATH) $(KALDI_LIBPATH) | tr " " :); \
ldd $(LIBDIR)/* | grep "not found" && false; \
export CNTK_EXTRA_LIBRARIES=$$(ldd $(LIBDIR)/* | grep "^\s.*=> " | cut -d ">" -f 2- --only-delimited | cut -d "(" -f 1 --only-delimited | sort -u | grep -Ff <(echo $(EXTRA_LIBS_BASENAMES) | xargs -n1)); \
test -x $(SWIG_PATH); \
export CNTK_LIB_PATH=$$(readlink -f $(LIBDIR)); \
PYTHONDIR=$$(readlink -f $(PYTHONDIR)); \
test $$? -eq 0; \
cd bindings/python; \
export PATH=$(SWIG_PATH):$$PATH; \
for ver in $(PYTHON_VERSIONS); \
do \
test -x $${py_paths[$$ver]}; \
$${py_paths[$$ver]} setup.py \
build_ext --inplace \
bdist_wheel \
--dist-dir $$PYTHONDIR || exit $$?; \
done'
ALL += python
endif
########################################
# General compile and dependency rules
########################################
ALL += $(ALL_LIBS)
VPATH := $(sort $(dir $(SRC)))
# Define object files
2016-10-25 01:33:31 +03:00
OBJ := \
$(patsubst %.cu, $(OBJDIR)/%.o, $(filter %.cu, $(SRC))) \
$(patsubst %.pb.cc, $(OBJDIR)/%.pb.o, $(filter %.pb.cc, $(SRC))) \
$(patsubst %.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(SRC)))
# C++ include dependencies generated by -MF compiler option
DEP := $(patsubst %.o, %.d, $(OBJ))
# Include all C++ dependencies, like header files, to ensure that a change in those
# will result in the rebuild.
-include ${DEP}
BUILD_CONFIGURATION := Makefile $(BUILD_TOP)/Config.make
2016-04-11 22:24:24 +03:00
2016-10-25 01:33:31 +03:00
%.pb.cc : %.proto $(BUILD_CONFIGURATION)
@echo $(SEPARATOR)
@echo compiling protobuf $<
$(PROTOC) --proto_path=$(dir $<) --cpp_out=$(dir $<) $<
$(OBJDIR)/%.o : %.cu $(BUILD_CONFIGURATION)
@echo $(SEPARATOR)
2015-12-15 11:58:24 +03:00
@echo creating $@ for $(ARCH) with build type $(BUILDTYPE)
@mkdir -p $(dir $@)
$(NVCC) -c $< -o $@ $(COMMON_FLAGS) $(CUFLAGS) $(INCLUDEPATH:%=-I%) -Xcompiler "-fPIC -Werror"
2016-10-25 01:33:31 +03:00
$(OBJDIR)/%.pb.o : %.pb.cc $(BUILD_CONFIGURATION)
@echo $(SEPARATOR)
@echo creating $@ for $(ARCH) with build type $(BUILDTYPE)
@mkdir -p $(dir $@)
$(CXX) -c $< -o $@ $(COMMON_FLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDEPATH:%=-I%) -MD -MP -MF ${@:.o=.d}
$(OBJDIR)/%.o : %.cpp $(BUILD_CONFIGURATION)
@echo $(SEPARATOR)
2015-12-15 11:58:24 +03:00
@echo creating $@ for $(ARCH) with build type $(BUILDTYPE)
@mkdir -p $(dir $@)
$(CXX) -c $< -o $@ $(COMMON_FLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDEPATH:%=-I%) -MD -MP -MF ${@:.o=.d}
.PHONY: clean buildall all unittests
clean:
@echo $(SEPARATOR)
@rm -rf $(OBJDIR)
@rm -rf $(ALL)
2016-02-01 22:16:08 +03:00
@rm -rf $(BUILDINFO)
2015-12-15 11:58:24 +03:00
@echo finished cleaning up the project
buildall : $(ALL)
@echo $(SEPARATOR)
@echo finished building for $(ARCH) with build type $(BUILDTYPE)