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
45a589814d
added a solution-level project dependency of 'cn' on 'CNTKMath' (now that it no longer has a reference)
2014-10-31 23:52:17 -07:00
70e58aa2d1
removed the reference from 'cn' to 'CNTKMath' project (other projects also do not use references)
2014-10-31 23:48:49 -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
7148d7c2a5
fixed an unused parameter in BsetGpu.h
2014-10-31 23:04:07 -07:00
75e262df76
removed a left-over of a merge conflict as it seems
2014-10-31 22:57:20 -07:00
03665868ac
Make setmode optional on unix platforms.
2014-10-31 17:31:31 -07:00
bf396c3b40
Fixing linux compilation problems.
2014-11-01 00:05:29 +00:00
9f85e4554a
Merge branch 'master' of https://git01.codeplex.com/cntk
2014-10-31 14:28:11 -07:00
c576fc6f2c
factored out dynamic loading of modules from Data{Read,Writ}er, in prep for Linux port
2014-10-31 13:59:01 -07:00
6cd2a6f36a
fixed previous check-in for the deleted auto-generated assignment operators, now using =default instead of implementing them actually;
...
removed a few seemingly superfluous 'typename's
2014-10-31 13:31:17 -07:00
22b7e0fc25
fixed some "default assignment operator deleted" issues with GCC;
...
two more mapped CRT functions that don't exist in GCC
2014-10-31 12:33:46 -07: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
f3cc47bc20
fixed cstring;
...
moved some wchar_t mappers back to fileutil.cpp
2014-10-31 11:58:24 -07:00
b0aef3dd2f
new class (w)cstring to make passing STL strings to C functions easier;
...
consolidating some mappings for VS-only functions in basetypes.h
2014-10-31 11:42:30 -07:00
ff71e32586
experimental makefile for eventual Linux port (not currently functional);
...
dummy stdafx.h added to Common/Include for GCC build
2014-10-31 10:33:00 -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
089b419181
(fixed a CRLF inconsistency)
2014-10-30 19:48:39 -07:00
f1d90eb895
Merge branch 'linuxport'
...
Conflicts:
Math/Math/Math.vcxproj.filters
2014-10-30 19:43:33 -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
5396f06d65
Adding untracked *.filters files. Oops.
2014-10-30 17:57:01 -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
88125bec4c
get/setfiletime() removed, as they are only used by functions identical to existing fuptodate() and fexists(), which we use instead
2014-10-30 16:40:23 -07:00
9fe2259f15
added two missing headers for compiling with GCC;
...
dummy implementation utf8() and utf16() for GCC (which currently only works for 7-bit ASCII characters)
2014-10-30 16:28:43 -07:00
Frank Seide
Jasha Droppo
Ubuntu
Mike Seltzer
adame
Malcolm Slaney