提交 · 158604fc773575a39c3e3865f56bfdd1820dcabf · PaddlePaddle / Paddle-Lite

07 6月, 2018 11 次提交
- W
  Merge remote-tracking branch 'upstream/develop' into develop · 158604fc
  由 wangliu 提交于 6月 07, 2018
```
# Conflicts:
#	CMakeLists.txt
#	src/framework/dim.h
#	src/framework/program/program-optimize/node.h
```
  158604fc
- W
  
  Merge remote-tracking branch 'upstream/develop' into develop · 58ed0fd3
  由 wangliu 提交于 6月 07, 2018
  
  58ed0fd3
- W
  Merge pull request #378 from dolphin8/develop · b26cc321
  由 WangLiu 提交于 6月 07, 2018
```
fix #374 rewrite some code in io.cpp & fix CMakeLists.txt in test
```
  b26cc321
- W
  Merge remote-tracking branch 'upstream/develop' into develop · 2513aa4c
  由 wangliu 提交于 6月 07, 2018
```
# Conflicts:
#	CMakeLists.txt
#	src/framework/dim.h
#	src/framework/program/program-optimize/node.h
```
  2513aa4c
- W
  Merge remote-tracking branch 'upstream/develop' into develop · 92c7ea22
  由 wangliu 提交于 6月 07, 2018
```
# Conflicts:
#	CMakeLists.txt
#	src/framework/dim.h
#	src/framework/program/program-optimize/node.h
```
  92c7ea22
- D
  
  Merge branch 'develop' into develop · 05b65411
  由 dolphin8 提交于 6月 07, 2018
  
  05b65411
- W
  Merge pull request #379 from codeWorm2015/develop · ee0ebd26
  由 WangLiu 提交于 6月 07, 2018
```
fix #375 remove unused code, format files
```
  ee0ebd26
- D
  
  rewrite some code in io.cpp & fix CMakeLists.txt in test · 127f0944
  由 dolphin8 提交于 6月 07, 2018
  
  127f0944
- W
  
  shrink so size · 5a05de6e
  由 wangliu 提交于 6月 07, 2018
  
  5a05de6e
- L
  
  format files · 8c50c99e
  由 liuruilong 提交于 6月 07, 2018
  
  8c50c99e
- L
  
  remove unused code, format files · 0a80ddfe
  由 liuruilong 提交于 6月 07, 2018
  
  0a80ddfe
06 6月, 2018 23 次提交
- D
  Merge pull request #370 from dolphin8/develop · fd7dab06
  由 dolphin8 提交于 6月 06, 2018
```
fix #371 add openmp support (disabled by default)
```
  fd7dab06
- D
  
  Merge branch 'develop' into develop · ac075940
  由 dolphin8 提交于 6月 06, 2018
  
  ac075940
- H
  
  openmp is disabled by default · 4af77add
  由 Haipeng Wang 提交于 6月 06, 2018
  
  4af77add
- Merge pull request #369 from codeWorm2015/develop · b8275554
  由朔-望提交于 6月 06, 2018
```
fix #368 remove unused code, modify build and cmake
```
  b8275554
- H
  
  Merge remote-tracking branch 'upstream/develop' into develop · 1f3fc18b
  由 Haipeng Wang 提交于 6月 06, 2018
  
  1f3fc18b
- H
  
  fix #pragma omp problem in clang-format · 848dce85
  由 Haipeng Wang 提交于 6月 06, 2018
  
  848dce85
- L
  
  remove unused code · 9b20d0c6
  由 liuruilong 提交于 6月 06, 2018
  
  9b20d0c6
- L
  
  remove test code · 4060d072
  由 liuruilong 提交于 6月 06, 2018
  
  4060d072
- L
  
  format files · 5ee13909
  由 liuruilong 提交于 6月 06, 2018
  
  5ee13909
- L
  
  format files · 6deffc38
  由 liuruilong 提交于 6月 06, 2018
  
  6deffc38
- L
  
  remove unused code, modify build and cmake · 4ea3d0a5
  由 liuruilong 提交于 6月 06, 2018
  
  4ea3d0a5
- S
  Merge pull request #367 from smilejames/develop · 01bef959
  由 smilejames 提交于 6月 06, 2018
```
control compile platform with build.sh script
```
  01bef959
- H
  
  change back to c++11 (c++17 is not necessary currently) · 51f70c41
  由 Haipeng Wang 提交于 6月 06, 2018
  
  51f70c41
- H
  
  add openmp-fix, openmp test · ef145680
  由 Haipeng Wang 提交于 6月 06, 2018
  
  ef145680
- Z
  
  control compile platform with build.sh script · e10cf3b7
  由 zhaojiaying01 提交于 6月 06, 2018
  
  e10cf3b7
- W
  Merge pull request #363 from cocodark/develop · 363fe103
  由 WangLiu 提交于 6月 06, 2018
```
Move /build.sh to /tools
```
  363fe103
- W
  
  modify code style · 040826b7
  由 wangliu 提交于 6月 06, 2018
  
  040826b7
- W
  
  modify code style · bd8e81bb
  由 wangliu 提交于 6月 06, 2018
  
  bd8e81bb
- W
  
  move io.h/cpp to io dir · ef7dbc04
  由 wangliu 提交于 6月 06, 2018
  
  ef7dbc04
- W
  Merge remote-tracking branch 'upstream/develop' into develop · 2a0ec71b
  由 wangliu 提交于 6月 06, 2018
```
# Conflicts:
#	tools/build.sh
```
  2a0ec71b
- W
  Merge remote-tracking branch 'upstream/develop' into develop · 3497d6b6
  由 wangliu 提交于 6月 06, 2018
```
# Conflicts:
#	tools/build.sh
```
  3497d6b6
- W
  Merge remote-tracking branch 'upstream/develop' into develop · 95d7fb80
  由 wangliu 提交于 6月 06, 2018
```
# Conflicts:
#	tools/build.sh
```
  95d7fb80
- W
  
  Move /build.sh to /tools · 01725716
  由 wangliu 提交于 6月 06, 2018
  
  01725716
05 6月, 2018 6 次提交
- S
  Merge pull request #365 from codeWorm2015/develop · 641f1da2
  由 smilejames 提交于 6月 05, 2018
```
fix #364 compress lib for specific net
```
  641f1da2
- L
  
  format files · 246b7a2a
  由 liuruilong 提交于 6月 05, 2018
  
  246b7a2a
- L
  
  compress lib for specific net · b3a38471
  由 liuruilong 提交于 6月 05, 2018
  
  b3a38471
- W
  
  Move /build.sh to /tools · c3483273
  由 wangliu 提交于 6月 05, 2018
  
  c3483273
- W
  Merge pull request #362 from cocodark/develop · 1e5ca101
  由 WangLiu 提交于 6月 05, 2018
```
Move /scripts to /tools
```
  1e5ca101
- W
  
  Move /scripts to /tools · 40f90681
  由 wangliu 提交于 6月 05, 2018
  
  40f90681