3dbabb6c29
Fixing references in project files
2014-11-07 18:24:13 -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
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
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
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
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
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
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
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
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
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
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
f2af40b96b
removed dependency of 'cn' project on the CUDA SDK (CNTKMath still needs the SDK at this point in time even if we want to compile for CPUONLY mode);
...
renamed GPU*.cuh to .h since neither actually contains CUDA kernel code;
moved an #include "BestGpu.h" to where it is used
2014-10-31 23:39:29 -07:00
bf396c3b40
Fixing linux compilation problems.
2014-11-01 00:05:29 +00:00
92fe5377d5
fixed ambigous type cast problems in ConfigValue;
...
added some more VS CRT mappings to basetypes.h (string compare functions)
2014-10-31 12:13:26 -07:00
4dd6d2f100
missing #include "stdafx.h" caused a problem when fiddling with CPUONLY #define
2014-10-30 22:23:40 -07:00
ca0f8d2a40
GPUDummy.cpp now compiles with GCC
2014-10-30 22:13:43 -07:00
2738da7496
corrected an inconsistent include-path setting;
...
undid previous commit which was wrong
2014-10-30 22:03:09 -07:00
9da359de1a
GPUDummy.cpp should not compile if CPUONLY
2014-10-30 21:55:49 -07:00
616f812d44
basetypes.h was missing the #include for stderror();
...
in GCC, members of base classes that have a template parameter require this-> unless one declares each with a 'using' directive, which was done here.
2014-10-30 21:53:21 -07:00
d72ad05fb4
GCC fails to lookup members in base classes of class templates ( http://stackoverflow.com/questions/11405/gcc-problem-using-a-member-of-a-base-class-that-depends-on-a-template-argument ), solved by explicit 'using' statements (this has the same effect as the earlier addition of this-> to every member access, but is simpler)
2014-10-30 21:24:47 -07:00
23fc4305a6
resurrected dummy implementation of utf{8,16}() since the portable standard wstring_convert class does not exist under GCC (does it under Linux proper?). We emulate this by using MBS conversion instead, which of course only works for 7-bit ASCII;
...
removed f{seek,tell}OrDie() since they are not used and don't compile under GCC;
GCC implementations of filesize() and getfiletime();
GCC version of renameOrDie() implemented with rename();
auto_file_ptr f = ... not working for GCC, need to use auto_file_ptr f (...);
grouped sources in Math project by CPU vs. GPU
2014-10-30 20:49:52 -07:00
c23dd1dab3
reviewed changes of linuxport and made it compile again on Windows. I had to undo the commenting out of C++11 features (lambdas, rvalue refs) which seem to have a problem with the Linux version of NVCC. We shall fix this later, it is likely a compiler-option issue.
2014-10-30 19:29:11 -07:00
ff72d5696f
Modify port code to support CPUONLY build
...
To use this define CPUONLY in the CN project
And remove *.cu from the math project and add GPUDummy.cpp instead
This allows use of Cygwin to compile both Windows and linux on same machine
2014-10-30 17:45:43 -07:00
a863c7746f
More changes to get it compiling.. but not finished.
2014-10-30 17:43:12 -07:00
33e48b635f
First attempt at getting stuff to compile under Linux. Not everything
...
in Math/Math works, but hopefully this is forward progress.
2014-10-30 17:41:20 -07:00
c848afb42b
Starting to fix things so they run under Linux
2014-10-30 17:41:12 -07:00
69643b7a94
removed WAV reading from fileutil.h, to remove an unnecessary Win32 dependency;
...
changed a 'byte*' to a 'char*' in GPUSparseMatrix.cu allowing to remove dependency on Windows.h;
fixed a Sleep() call for Linux compat
2014-10-30 14:41:33 -07:00
29f5adff6e
removed message.h from Solution
2014-10-30 10:38:38 -07:00
a4bc3b64f0
removed dependency of File.cpp on message.h
2014-10-30 09:45:02 -07:00
67f40ac285
removed some unused Windows-specific code from basetypes.h;
...
created a sub-structure inside projects that matches the actual directory names for shared files to make those easy to spot;
disabled some warnings in the test projects since we don't care much for those;
some warnings in test projects fixed
2014-10-30 09:28:27 -07:00
9078a01916
some more non-standard VS CRT calls replaced by standard
2014-10-23 11:55:53 -07:00
0bd78a9246
removed dependency on tchar.h, instead changed to wmain and wchar_t throughout (it's 2014 after all!)
2014-10-23 09:34:40 -07:00
4afe861cfb
towards portable code: disabled warnings for using "unsafe" CRT functions (not available in GCC/Linux) and a few unnecessary Win32-dependent pieces of code that were not actually used;
...
CNTKEval now compiles at warning level 4 without error
2014-10-23 09:16:51 -07:00
0ed4183cf8
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-10-20 14:57:20 -07:00
9622e85478
fixed the post-build event in CNTKMath that is supposed to copy the ACML and CUDA libs
2014-10-20 14:57:11 -07:00
1b4cff674e
fixed a bug in the ComputeInputPartialFeature of GMMLoglikelihoodNode;
...
added AddWithRowSliceValuesOf math function
2014-10-17 14:15:25 -07:00
2f193faf95
Fixed problem with typecasts that were preventing the build.
2014-10-17 08:44:09 -07:00
2dc6540f21
Initial implementation of RMSProp for dense matrices. Does not work for
...
sparse matrices.
2014-10-16 19:11:03 -07:00
Jasha Droppo
Dong Yu
Frank Seide
Ubuntu
adame
Malcolm Slaney