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
9ffed1b4fd
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-11-03 17:08:21 -08:00
9f3aa1b453
all classes that derive from ComputationNode now add a macro UsingComputationNodeMembers at the start, to make its base-class members visible--this seems to pass GCC now (although other issues still prevent it from compiling);
...
fixed an error string in cn.cpp;
added template args to base class constructors where needed by GCC;
replaced some wsprintf() by sprintf() in CompositeComputationNode.h since wsprintf() does not exist on Cygwin GCC and is not necessary here;
fixed a missing & in ClassBasedCrossEntropyWithSoftmaxNode::CopyTo() prototype;
changed some explicit iterator types that failed in GCC due to name lookup issues to auto;
changed one _itoa_s() to an sprintf();
changed an identifier 'default' to 'deflt' as it conflicted with the keyword of the same name
2014-11-03 17:08:12 -08:00
0255f86a15
minor fix to TIMIT examples
2014-11-03 15:51:53 -08:00
e505a732ed
undid one RuntimeError() call since it is not available inside GPUMatrix.h
2014-11-03 15:28:40 -08:00
80908da949
replaced a few more "throw exception" with RuntimeError() since std::exception does not accept a string arg on GCC
2014-11-03 14:45:05 -08:00
1c2b0acfac
removed use ULONG type (was used for a random seed, i.e. nothing Windows-specific, using unsigned long instead);
...
added some dummy #defines of Windows types to PTasks so that it compiles without Windows.h (not functional for now);
2014-11-03 14:37:14 -08:00
da0bda8bec
changed WCHAR to wchar_t where appropriate
2014-11-03 14:22:10 -08:00
53f7f95fa8
removed several #includes of Windows.h and WinBase.h which seemed to be unnecessary (what dealing does SGD.h have with Windows?);
...
dummy GCC version of hostname()
2014-11-03 14:17:44 -08:00
295d951fbc
removed #includes of rpc.h and WinBase.h, as it compiles without under Windows and causes grief with GCC;
...
files from 'cn' added to GCC makefile (it does not compile)
2014-11-03 14:03:24 -08:00
1875735042
added strnlen() for Cygwin builds since it seems to be missing there (Cygwin is used for quick-checking GCC builds)
2014-11-03 13:46:13 -08:00
2ad177ce4b
changed back from f[gs]etpos() to ftello()/fseeko() for GCC builds since f[gs]etpos() turned out to not work under actual Linux (while being OK on Cygwin)
2014-11-03 13:30:30 -08:00
93d22de2bb
made 5 more functions in basetypes.h 'static inline' to avoid link errors from duplicate definitions
2014-11-03 13:15:39 -08:00
8a29a87a63
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-11-03 11:34:31 -08:00
1fd17be504
replaced two silly uses of {wcs,str}nlen() with {wcs,str}len() (it makes no sense if the given length limit is SIZE_MAX)
2014-11-03 11:34:24 -08:00
426b3125fc
Hiding binary/text mode from linux builds
2014-11-03 19:22:50 +00:00
6cc5ad9445
switched f[sg]etpos() back to using the CRT functions of the same name also for GCC/Linux, after it has been confirmed to build (despite violating the standard)
2014-11-03 10:35:05 -08:00
5bac0b91c8
(comments edited)
2014-11-02 22:49:59 -08:00
45777b7134
changed hack definition of CRITICAL_SECTION from a #define to a typedef;
...
changed some problems in ComputationNode.h from accessing members of a base class with a type parameter (which requires some explicit declaration or namespacing)--this is not good, too much code dup here, we should factor some of the code out
2014-11-02 22:21:18 -08:00
b99df9d126
removed an unused #include <hash_set> which blew up under GCC
2014-11-02 20:16:38 -08:00
5b2213674a
removed seemingly unnecessary dependency of PTaskGraphBuilder on cuda_runtime.h;
...
added MachineLearning/cn in GCC makefile include path
2014-11-02 20:12:41 -08:00
904631c2f5
Plugin::Load() changed to also take wstrings (in additioin to strings), and also fixed two calls to it which unnecessarily passed c_str() instead of string;
...
changed Eval.cpp to use Plugin, now compiles under GCC
2014-11-02 20:01:21 -08:00
2d045268d1
ConfigFile.cpp now compiles (needed another stdlib mapping, _wcsnicmp(), and to change an assignment to a constructor call)
2014-11-02 19:37:32 -08:00
575339add8
changed GCC version of fileutil to use ftello/fseeko instead of fgetpos/fsetpos (expertimental probably not needed);
...
fixed some C++11 insanity with types declared inside a base class that has a template parameter (Label{Id}Type in IData{Read,Writ}er), now compiles with GCC
2014-11-02 19:18:53 -08:00
f40f04074b
changed _isnan() and _finite() to std::isnan() and std::isfinite(), for GCC compat
2014-11-01 21:12:30 -07:00
3c836508f4
updated GPUDummy.cpp to latest, CPUONLY version does build now on Windows
2014-11-01 00:57:25 -07:00
bb1385625a
added .dep to .gitignore
2014-11-01 00:21:06 -07:00
4160f15f4e
::isnan() no longer compiled with GCC, but isnan() does
2014-11-01 00:11:49 -07:00
cb89cc0a61
fixed usage of CPUONLY (GPUDummy.cpp still does not compile due to missing functions, and PTasks ignore CPUONLY as well currently)
2014-11-01 00:02:06 -07:00
Frank Seide
Jasha Droppo
Mike Seltzer