Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cherry picked windows patches. #14046

Merged
merged 71 commits into from
Nov 8, 2018
Merged

cherry picked windows patches. #14046

Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
adec702
cudnn widndows
dzhwinter Aug 17, 2018
963a745
"add comment"
dzhwinter Aug 17, 2018
335398f
dlfnh
dzhwinter Aug 17, 2018
59160e8
"windows support"
dzhwinter Aug 17, 2018
36878d7
comment out backtarce
dzhwinter Aug 17, 2018
64ce121
"windows support"
dzhwinter Aug 17, 2018
5c88cd2
remove werror in windows
dzhwinter Aug 17, 2018
f1a7ae3
"fix cmake error"
dzhwinter Aug 20, 2018
17602ea
windows port of malloc
dzhwinter Aug 20, 2018
c5722eb
merge windows/cudnn
dzhwinter Aug 20, 2018
34f8c9b
windows port
dzhwinter Aug 24, 2018
89f95ea
merge develop branch
dzhwinter Aug 24, 2018
c1ad52f
pre-commit
dzhwinter Aug 24, 2018
cfbf1ba
add source
dzhwinter Aug 24, 2018
a94d4f5
fix math_function compile
dzhwinter Aug 24, 2018
65f144a
fix commit
dzhwinter Aug 24, 2018
c7e0ed8
inference lib
dzhwinter Aug 24, 2018
488a2dd
with ir node
dzhwinter Aug 25, 2018
efd0884
add op registry
dzhwinter Aug 25, 2018
d7f98f3
more platform is done
dzhwinter Aug 25, 2018
26dbe35
add msvc flags and copy lib done
dzhwinter Aug 26, 2018
7dceb8a
check some operators
dzhwinter Aug 26, 2018
2ec589a
float.h fixed
dzhwinter Aug 26, 2018
cd8f3e9
operator module is done
dzhwinter Aug 27, 2018
78aab05
fix more op errors
dzhwinter Aug 27, 2018
b74af56
cpu compile is done
dzhwinter Aug 28, 2018
b78394e
done
dzhwinter Aug 29, 2018
f5329d6
add some synatx
dzhwinter Aug 30, 2018
5e8e7fb
change data type
dzhwinter Aug 30, 2018
dbe90cc
merge develop branch
dzhwinter Sep 1, 2018
b5402d7
Merge remote-tracking branch 'origin/develop' into windows/support
dzhwinter Sep 2, 2018
52d60f8
merge conclit
dzhwinter Sep 2, 2018
5c2637e
tensor util
dzhwinter Sep 2, 2018
75681c0
switch to 9.2
dzhwinter Sep 2, 2018
a0aa2ec
build compile
dzhwinter Sep 2, 2018
379b471
squash commit
dzhwinter Sep 3, 2018
c3e1fb5
add demo
dzhwinter Sep 12, 2018
372caf4
windows staff
dzhwinter Sep 14, 2018
e199953
debug the device context
dzhwinter Sep 14, 2018
85f8dd1
debug version
dzhwinter Sep 14, 2018
3ae9645
compile in linux
wanghaoshuang Oct 14, 2018
b12f7c2
compile in linux.
wanghaoshuang Oct 15, 2018
962061f
windows fix
dzhwinter Oct 15, 2018
804dd7d
merge conflict. both linux and windows pass.
dzhwinter Oct 15, 2018
e41a3fc
fix update to develop hang problem.
dzhwinter Oct 16, 2018
607080e
windows static library
dzhwinter Oct 23, 2018
f9e7cfb
save binary file
wanghaoshuang Oct 23, 2018
5993155
Merge remote-tracking branch 'dzhwinter/windows/support' into windows…
wanghaoshuang Oct 23, 2018
78cf76a
fix linux compile
wanghaoshuang Oct 23, 2018
9e522a4
update cmake
wanghaoshuang Oct 23, 2018
c6dcffc
lb. add debug output
dzhwinter Oct 23, 2018
dbd0075
Merge branch 'windows/support' into lb
dzhwinter Oct 23, 2018
597d921
clean demo_ci
dzhwinter Oct 24, 2018
abe8e20
clean demo_ci
dzhwinter Oct 24, 2018
b154e0b
clean demo_ci
dzhwinter Oct 24, 2018
468467f
update real incnet tester
dzhwinter Oct 24, 2018
09409ba
staged. test speed=49ms in 1080.
dzhwinter Oct 26, 2018
7141deb
add cudnn back. staged.
dzhwinter Oct 26, 2018
c8adc2c
cudnn version. staged.
dzhwinter Oct 29, 2018
ebfe5a0
merge develop branch
dzhwinter Oct 30, 2018
bf2e4cb
cleard. staged
dzhwinter Oct 30, 2018
3167658
add back jit simd instructions. stage.
dzhwinter Oct 31, 2018
9da7b33
details
dzhwinter Nov 1, 2018
1ace55c
merge develop branch
dzhwinter Nov 1, 2018
0a18058
clean cmake. test=develop
dzhwinter Nov 1, 2018
eb2f7ed
refine tests. test=develop
dzhwinter Nov 2, 2018
cc02353
test=develop
dzhwinter Nov 2, 2018
60f70b1
test=develop
dzhwinter Nov 4, 2018
deb4af7
add test
dzhwinter Nov 7, 2018
2835e04
merge develop branch. test=develop
dzhwinter Nov 7, 2018
234a1d9
Merge remote-tracking branch 'origin/develop' into windows/debug
dzhwinter Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge develop branch. test=develop
  • Loading branch information
@dzhwinter
dzhwinter committed Nov 7, 2018
commit 2835e0440951ba6a3eb8d92a21066fde1a54ea01
10 changes: 7 additions & 3 deletions paddle/fluid/operators/math/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ cc_test(cpu_vec_test SRCS cpu_vec_test.cc DEPS blas cpu_info)
if (NOT WIN32)
math_library(matrix_bit_code)
endif (NOT WIN32)
cc_library(jit_kernel
SRCS jit_kernel.cc jit_kernel_blas.cc jit_kernel_exp.cc jit_kernel_rnn.cc jit_kernel_crf_decode.cc
DEPS cpu_info cblas)
set(JIT_KERNEL_SRCS jit_kernel.cc jit_kernel_blas.cc jit_kernel_exp.cc jit_kernel_rnn.cc jit_kernel_crf_decode.cc)
set(JIT_KERNEL_DEPS cpu_info cblas gflags enforce)
if(WITH_XBYAK)
list(APPEND JIT_KERNEL_SRCS jit_gen.cc jit_code.cc)
list(APPEND JIT_KERNEL_DEPS xbyak)
endif()
cc_library(jit_kernel SRCS ${JIT_KERNEL_SRCS} DEPS ${JIT_KERNEL_DEPS})
cc_test(jit_kernel_test SRCS jit_kernel_test.cc DEPS jit_kernel)
You are viewing a condensed version of this merge commit. You can view the full changes here.