b2df254092
Fixed warnings and typos in fprintf() statements
2014-11-11 16:24:58 +00:00
e68c22490b
Moving location of variables to avoid conflicts between cn.exe and dll building
2014-11-07 18:25:28 -08:00
3369f5eaec
Better error message when DBN conversion fails
2014-11-07 18:25:00 -08:00
3dbabb6c29
Fixing references in project files
2014-11-07 18:24:13 -08:00
91e7bcba48
Better #ifdef test for secure STL
2014-11-07 18:22:51 -08:00
735227c8b8
Changes to get CNTKEval to compile on Windows
2014-11-07 10:48:31 -08:00
951d123abb
fixed bug in precompute function
2014-11-07 09:07:08 -08:00
29c42731b1
change each tab to four spaces for new code pulled.
2014-11-06 20:13:44 -08:00
b9f1268172
Merge branch 'master' of https://git01.codeplex.com/cntk
...
Conflicts:
MachineLearning/cn/cn.cpp
2014-11-06 19:51:49 -08:00
b46302c10f
replace all tabs to four spaces in all files in the solution.
2014-11-06 19:24:05 -08:00
e307cb098e
Initial version of MPI based model averaging code. Define MPI_SUPPORT in the CN project to enable the code.
2014-11-06 18:46:49 -08:00
c50e750b62
Fixed the bug that when an argument is missing when calling a macro the NDL parsing code goes into infinite loop. The fix checks and identify the loop and report an error.
2014-11-06 18:39:14 -08:00
eb729df7bf
added all reader sources to GCC makefile (most don't compile yet)
2014-11-04 21:51:12 -08:00
ffd5e3baa5
added _countof() macro to basetypes.h;
...
Binary{Read,Writ}er now compiles with GCC;
fixed a few missing c_str() in sprintf() on the way;
added BinaryReader sources to GCC makefile--BinaryFile still does not compile
2014-11-04 21:35:54 -08:00
8feb23fc79
defined fake memcpy_s() in basetypes.h for GCC;
...
fixed last bits in CNTKEval.cpp, also compiles now
2014-11-04 20:07:35 -08:00
1d4dd604ba
removed outdated dup of NetworkDescriptionLanguage.cpp
2014-11-04 19:41:08 -08:00
3f085c6448
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-11-04 19:26:00 -08:00
51e25b4b24
fixed a missing 'const' specifier that caused a build break
2014-11-04 19:25:49 -08:00
d044c66fe8
Changing %ws to %ls in *printf() within the MachineLearning/cn/* source
2014-11-05 03:23:48 +00:00
4d46e5f8dd
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-11-04 17:31:22 -08:00
ad71ed4471
tests.cpp builds now
2014-11-04 17:31:13 -08:00
f09e332ebd
fixed a few more GCC syntax nitpicks
2014-11-04 17:22:14 -08:00
c404103ecd
Shielded noreturn declspec for non-msvc environments, included basetypes.h to make sure declarations are seen, changed name of GPUDummy.cpp to NoGPU.cpp in the makefile (filename change was made previously.)
2014-11-05 01:11:22 +00:00
c9b3032a18
missed a & in tolower_ascii()
2014-11-04 16:53:26 -08:00
814fce53da
removed a circular #include situation for NDLUtil.h;
...
fixed more missing c_str() in fprintf() and RuntimeError() calls
2014-11-04 16:52:16 -08:00
a9b972e735
template syntax fix in ComputationNode.cpp, compiles now under GCC
2014-11-04 16:37:39 -08:00
d787d109f1
moved _wunlink() and _wmkdir() to basetypes.h since they were used at more than one place;
...
ConfigValue::operator unsigned long() is ambigous on GCC/x64, now not declaring it there;
discovered several incorrect "throw new runtime_error()" (notice the "new"), replaced with RuntimeError() or throw std::runtime_error(), as appropriate;
changed several initializations of ConfigParameters x = y to ConfigParameters x(y) since it blew up on GCC which tries to use a private move constructor;
eliminated an unnecessary use of Windows type LONG64;
fixed several fprintf() and RuntimeError() calls where a std::string was passed without c_str();
fixed a few more accesses to base-class members where base class has a template parameter;
fixed a few bad TABs;
minor other stuff that failed on GCC;
cn.cpp compiles now on GCC--yay!
2014-11-04 16:35:10 -08:00
c65db6fe2d
GCC version of TimeDateStamp()--actually compiles under Windows, too, so we use that instead;
...
fixed a bunch of fprintf()s that got STL strings passed instead of c_str()
2014-11-04 15:40:06 -08:00
4ab6c1e766
minor GCC break fixes in cn.cpp;
...
changed wsprintf() in ComputationNode.h to sprintf()
2014-11-04 14:14:45 -08:00
ba4a881916
fixed two unnecessary class name qualifiers, which blew up the GCC build
2014-11-04 13:50:57 -08:00
16f18fc290
changed XXX::iterator to auto where possible, as some had caused a build problem with GCC
2014-11-04 13:47:58 -08:00
34d9010204
new method tolower_ascii() which replaces the various transform() calls that caused build breaks in GCC;
...
renamed _strcmpi() to _stricmp() (which on GCC maps to strcasecmp());
changed the one use of UINT16 (for traceLevel) to a plain int
2014-11-04 13:35:18 -08:00
54f8e24160
added the CNTKMathCUDA project files
2014-11-04 13:05:53 -08:00
77b67581a6
removed one low-importance test case which caused a link error, to be fixed at some later date
2014-11-04 12:05:15 -08:00
2f34b219e8
Matrix.cpp now includes GPUWatcher.h to get this class exported from the DLL
2014-11-04 11:49:59 -08:00
49e2eb4c11
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-11-04 11:43:42 -08:00
5c942af8c4
{Runtime,Logic}Error() declared __declspec(noreturn) to remove unreachable-code warnings (I also had to change the return type from 'bool' to 'void', so no more xxx || RuntimeError() pattern, but that was not used yet anyway);
...
fixed a few additional unreachable-code warning;
moved linker #pragma for CNTKMathCUDA.lib from GPUMatrix.h (which is seen from the outside) to Matrix.cpp (which is DLL-local), which prevents link errors in the test projects
2014-11-04 11:43:36 -08:00
75b923316e
Designating __declspec(dll*) macros for _WIN32 only
2014-11-04 19:16:23 +00:00
51e86d5eea
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-11-04 11:00:38 -08:00
1a4be89e7c
changed a few more 'throw runtime_error' to RuntimeError() calls;
...
wmain now returns EXIT_FAILURE (==1) on failure rather than -1 (which is totally non-standard)
2014-11-04 11:00:28 -08:00
5f6a72bcf9
Fixing case issues on header filenames for Linux build
2014-11-04 18:40:47 +00:00
2450557e5b
undid accidental check-in of CPUONLY flag set in BestGpu.h
2014-11-04 09:44:53 -08:00
35e2211147
moved DeviceFromConfig() for CPUONLY mode back to BestGpu.h since it otherwise caused link errors for reader projects that did not include BestGpu.cpp;
...
.CU files now include BestGpu.h to get access to CPUONLY flag;
CPUONLY mode set from BestGpu.h now compiles in VS with SDK installed
2014-11-04 09:34:53 -08:00
b2d77c5d8b
NoGPU.cpp now includes BestGpu.h to see the CPUONLY #define
2014-11-04 09:17:30 -08:00
a57b0ef1dd
BestGpu.h no longer depends on commandArgUtil.h
2014-11-04 09:13:42 -08:00
beb24799fe
BestGpu.h is now the place to #define CPUONLY in source code if needed (which you would do when compiling from Visual Studio. You can also define it on the compiler command line, which you would do when compiling from an explicit makefile);
...
references to CUDA libs moved from BestGpu.h to the .cpp, which is will soon be moved into the CNTKMathCUDA project and thus not get compiled if no CUDA SDK is installed;
no-CUDA implementation of DeviceFromConfig() moved from BestGpu.cpp to NoGPU.cpp;
removed several no-longer-needed CUDA references from project files--two referenced-lib settings are now again identical between Debug and Release, they were inconsistent before
2014-11-04 09:10:32 -08:00
11a7c05c23
removed CUDA SDK dependency of CNTKMath project
2014-11-04 08:46:18 -08:00
80e740aac6
split all CUDA-specific code off from CNTKMath into a separate project CNTKMathCUDA, with the final goal that the Math project can compile without the (1 GB large) CUDA SDK installed;
...
renamed GPUDummy.cpp to NoGPU.cpp;
TODO: two test projects currently fail, and CNTKMath still depends on CUDA, to be fixed next
2014-11-04 08:38:32 -08:00
5a30a55daa
tidied up BestGpu: moved class declaration into .cpp file since it is only used there, removing a dependency; cleaned up TABs
2014-11-04 08:01:52 -08:00
07d24166a1
(added a comment)
2014-11-03 17:13:00 -08:00
Jasha Droppo
Mike Seltzer
Dong Yu
Frank Seide