Compare commits

..

315 Commits

Author SHA1 Message Date
mindspore-ci-bot a86589e6e5 !14620 add npu op mirror pad sec
5 years ago
zhaozhenlong 011c7508c5 add npu op mirror pad for art gene
5 years ago
mindspore-ci-bot e4bfb4439a !14497 enhance_update net on gate
5 years ago
zhaozhenlong 5b37f667ef enhance update on gate
5 years ago
mindspore-ci-bot ab0e68c805 !14362 [MS][LITE][Develop]fix CodingStyle warnings
5 years ago
lixian 06480a79bf fix coding style
5 years ago
mindspore-ci-bot f69e273cf3 !14338 philox random algorithm
5 years ago
mindspore-ci-bot 9215177d42 !14478 fix effnet script
5 years ago
xutianchun e493a7d042 fix effnet.py
5 years ago
mindspore-ci-bot 1775ce0597 !14115 [MSLITE] Fix the bug of matmul int8 for arm32
5 years ago
zhaodezan 2b723e72a5 sec fix uniform real op
5 years ago
mindspore-ci-bot 1c235b9855 !14377 [MS_LITE] fix issue to sec
5 years ago
mindspore-ci-bot 253b2db10d !14382 [MSLITE][DEVELOP] clear static check warnings in module of lite runtime op
5 years ago
mindspore-ci-bot 37095afa4b !13749 [MS][LITE]append some models to the entrance guard
5 years ago
mindspore-ci-bot 883249a410 !14363 fix codex warnings
5 years ago
yangruoqi713 a71df9f09c [MSLITE][DEVELOP] clear static check warnings in module of lite runtime op
5 years ago
mindspore-ci-bot 5e55ce49ac !14361 fix static check
5 years ago
yefeng ccd133dc9d fix-issue
5 years ago
yeyunpeng2020 57df62bbc7 fix static check
5 years ago
xutianchun cd356874d3 fix codex warinnings
5 years ago
mindspore-ci-bot 53b7d6342f !14343 [MS_LITE] add ios reg
5 years ago
mindspore-ci-bot bbc1f6c4a5 !14311 [MS][LITE][Develop]fix exp for big-endian devices
5 years ago
zengxianglong 3637c5e86a append some models to the entrance guard
5 years ago
yefeng 791de31abb ios_reg_ops
5 years ago
mindspore-ci-bot d512872ca8 !14282 [MS_LITE] iOS fp16
5 years ago
mindspore-ci-bot 45ddcbaaa4 !14302 [MS][LITE][Develop]optimize fp32 prelu
5 years ago
mindspore-ci-bot 63df7d50d3 !13577 [MSLITE] Fix bug of conv1d to adjust npu.
5 years ago
lixian fc1400874a fix exp for big-endian devices
5 years ago
lixian c8fdaaa09c optimize fp32 prelu
5 years ago
yefeng 47a9efca65 ios_fp16
5 years ago
mindspore-ci-bot 163990eaf1 !14258 java support linux x86 avx & sse
5 years ago
yeyunpeng2020 25da6091a6 java support linux x86
5 years ago
mindspore-ci-bot 6ccf4848c1 !14176 [lite]fix memory leak
5 years ago
xuanyue 21f97de31b fix memory leak
5 years ago
wang_shaocong ffd415393d [MSLITE] fix bug of conv1d to adjust npu.
5 years ago
zhanyuan 74a3021c1d [MSLITE] Fix the bug of matmul int8 for arm32
5 years ago
mindspore-ci-bot 3701346618 !14043 [MSLITE][DEVELOP] fix bug of npu convolution
5 years ago
mindspore-ci-bot dbc6d0101a !14063 fix make equal less npu-unsupported case
5 years ago
zhaozhenlong 97bca1d9d6 fix equal 2d less 1d segment fault
5 years ago
mindspore-ci-bot 7d83431702 !13697 [lite]layernorm fusion and gelu fusion
5 years ago
yangruoqi713 216067597c [MSLITE][DEVELOP] fix bug of npu convolution
5 years ago
xuanyue 621fb7d5e3 layernorm fusion and gelu fusion
5 years ago
mindspore-ci-bot b0942a5da2 !13930 [MS][LITE][Develop]fix return value of tensor name
5 years ago
lixian 1df5f29103 fix tensor name
5 years ago
mindspore-ci-bot 403a822428 !13900 [MS][LITE][CPU] fix transpose bug TODO
5 years ago
lzk c2c9054bc4 power bug fix
5 years ago
mindspore-ci-bot 8199522ea6 !13872 [MS_LITE] ios_part_3_to_sec
5 years ago
mindspore-ci-bot b86b4a5895 !13870 [MS_LITE] ios_part_1_to_sec
5 years ago
mindspore-ci-bot f7863ef383 !13868 [MS_LITE] ios_part_1_to_sec
5 years ago
mindspore-ci-bot d300537975 !13797 [MS][LITE][CPU]fix reduce
5 years ago
mindspore-ci-bot 09d7c88f16 !13797 [MS][LITE][CPU]fix reduce
5 years ago
yefeng a552817d25 part_3-1
5 years ago
yefeng c099a65dbf ios_part_2_to_sec_cmake
5 years ago
yefeng 4ffa0ff785 assembly-1
5 years ago
mindspore-ci-bot b0560234e6 !13756 [MS][LITE][Develop]fix write for big endian devices
5 years ago
fuzhiye 2b138acf95 fix bug of reduce && floormod
5 years ago
mindspore-ci-bot c4cf6fccfa !13775 [ms][lite][cpu] power secfp16 optimize
5 years ago
mindspore-ci-bot a43f96ac5e !13755 [MSLITE][Develop] fix bug of arm cpu op gather while running in multi-threaded mode
5 years ago
lzk 90d7393f69 power_sec
5 years ago
mindspore-ci-bot d421dc87e9 !13665 [MSLITE][Develop] fix LogicalAnd
5 years ago
mindspore-ci-bot f0cafbd453 !13748 [ms][lite][cpu] max thread auto get
5 years ago
mindspore-ci-bot 5177dfed51 !13708 [ms][lite][cpu] gelu sec optimize
5 years ago
mindspore-ci-bot 1eb4e4e922 !13535 [ms][lite][cpu]arightmetic fp16 sec bug fix
5 years ago
lixian cfc3e0086e fix write for big endian devices
5 years ago
yangruoqi713 576a805036 [MSLITE][Develop] fix bug of arm cpu op gather while running in multi-threaded mode
5 years ago
lzk 49688f555a max thread num
5 years ago
lzk 48fad7dd27 gelu_sec
5 years ago
sunsuodong d4a2da250e fix_LogicalAnd
5 years ago
mindspore-ci-bot 7a3657279c !13298 [lite]matmul and add fusion
5 years ago
xuanyue bd354a09d6 matmul and add fusion
5 years ago
mindspore-ci-bot 842b723f42 !13464 [MSLITE] Modify ci test script.
5 years ago
lzk 9a87efb6f4 arithmetic_fp16
5 years ago
mindspore-ci-bot fdd2dd6258 !13484 [ms][lite][cpu] softmax optimize fp16
5 years ago
mindspore-ci-bot ce0cdbc3e2 !13470 [ms][lite][cpu] power optimize
5 years ago
mindspore-ci-bot 81e7f51f26 !13495 [MS][LITE][Develop]fix some onnx_111 problem
5 years ago
mindspore-ci-bot 0e80dd9aa8 !13486 [MS][LITE][GPU]GPU support print profiling info
5 years ago
lzk 59799bb8a3 softmax fp16
5 years ago
Pengyongrong 8ab8b9655e fix some onnx_111 problem
5 years ago
mindspore-ci-bot f6dd53bfcc !13467 [MS][LITE][Develop]add 1d f(2,3) support for 3x3 dw conv
5 years ago
chenzupeng f7ea0880c3 gpu support print profiling info
5 years ago
lzk 970c3f4b14 power fp16
5 years ago
mindspore-ci-bot ea0c4d68f4 !13411 [MSLITE][Develop] sync master arithmetic
5 years ago
lixian 2605104059 add 1d f(2,3) support for 3x3 dw conv
5 years ago
mindspore-ci-bot c80b790e57 !13408 [MS][LITE][GPU]reduce support axis=3
5 years ago
sunsuodong 51e3c4048c sync master arithmetic
5 years ago
mindspore-ci-bot 952f1d7e3f !13376 [MSLITE] Fix the bug of gather fp16
5 years ago
lz 7d918f8ea9 !13351 Fixed a bug in benchmark_train
5 years ago
mindspore-ci-bot 269125c3c4 !13445 [MS_LITE] fix SquaredDifference loopcount acc
5 years ago
mindspore-ci-bot 5591a6bae1 !13253 [MS][LITE][Develop]fix mirror padding float abortion
5 years ago
wang_shaocong 572d423ce0 [MSLITE] Modify ci test script.
5 years ago
mindspore-ci-bot 5ce840c93f !13308 [MS][LITE]reduce mean int func
5 years ago
fuzhiye 25cea84c91 add reduce_mean int func
5 years ago
mindspore-ci-bot 31a2e48e76 !13289 [MS][LITE]add models to the sec-icsl entrance guard
5 years ago
yefeng e55430588c 0317-1
5 years ago
zengxianglong 5c48eb4009 add models to the entrance guard
5 years ago
chenzupeng 99c4aad3ab reduce support axes=1
5 years ago
zhanyuan 1ded8dd733 [MSLITE] Fix the bug of gather fp16
5 years ago
mindspore-ci-bot b7d856367e !13318 [MSLITE] Optimize gather fp16 op's performance
5 years ago
lixian 554ad2909b fix mirror padding float abortion
5 years ago
liujiahan 47e20e070f Fixed a bug in benchmark_train
5 years ago
mindspore-ci-bot 64e6c3b70b !13349 fix subgraph intensor order mismatch
5 years ago
mindspore-ci-bot 34f33a9ed6 !13300 [MSLITE][Develop] fix bug of cpu arm32 MatVecMul
5 years ago
mindspore-ci-bot 48cdc13867 !13331 [MS][LITE][GPU]conv2d transpose support n > 1
5 years ago
wandongdong 542a712498 fix subgraph in_tensor dismatch op in_tensor order
5 years ago
mindspore-ci-bot 9d94bdcb3f !13315 [MS][LITE]exchange two model with reverse name in entrance guard
5 years ago
chenzupeng 9d94572898 deconv support n > 1
5 years ago
zengxianglong 59998baa77 temp cancel models
5 years ago
zhanyuan 7d883ae661 [MSLITE] Optimize gather fp16 op's performance
5 years ago
yangruoqi713 080d1cc10a [MSLITE][Develop] fix bug of cpu arm32 MatVecMul
5 years ago
mindspore-ci-bot b5992c5767 !13255 [MS][LITE][Develop] fix some problems for gpu ops
5 years ago
mindspore-ci-bot 0cb3052535 !13254 [MS][LITE][GPU]op support n>1
5 years ago
chenzupeng 6c2c79c308 op support N>1
5 years ago
Pengyongrong 18c36acf97 fix some problems for gpu ops
5 years ago
mindspore-ci-bot c9708b177e !13228 fix argminmax bug when axis=3
5 years ago
wandongdong 4ad6dd9d75 fix argminmax bug when axis=3
5 years ago
mindspore-ci-bot aaf88452b6 !13154 mindspore lite java support linux x86
5 years ago
mindspore-ci-bot 9fc7147ed8 !13118 [MSLITE] add support for conv1d operator.
5 years ago
yeyunpeng2020 1782399e8f java support linux x86 jar
5 years ago
wang_shaocong b5a9432e3d [MSLITE] add support for conv1d operator.
5 years ago
mindspore-ci-bot a34760d6fd !12986 [MSLITE] Fix bug of the padding parameter of pad operator.
5 years ago
mindspore-ci-bot ab6cdf7e4e !12991 [ms][lite][cpu] add softplus randomnormal ops
5 years ago
lzk 5b11db29b1 softplus add
5 years ago
wang_shaocong 9493622451 [MSLITE] Fix bug of the padding parameter of onnx pad operator.
5 years ago
mindspore-ci-bot 5dc3355d50 !12722 mindspore lite java support linux x86
5 years ago
yeyunpeng2020 aa84e8af6d add decoder tf parser
5 years ago
mindspore-ci-bot 691298fe7f !12873 [MS_LITE] fixlog
5 years ago
yefeng a5167f2c06 fix_log_4
5 years ago
mindspore-ci-bot 46d984da7c !12901 [MS][LITE][CPU]fix bug of arithmetic compare fp16 op
5 years ago
mindspore-ci-bot 7793e6c2d0 !12849 [MS][LITE][CPU]merge erf op
5 years ago
fuzhiye dec92bf2d7 fix arithmetic_compare_fp16 op bug
5 years ago
mindspore-ci-bot 0ae723e4f4 !12846 [MS_LITE] fix gpu
5 years ago
fuzhiye 38eaf7c9f7 merge erf op
5 years ago
yefeng fdfa77c7f7 fix_gpu_1
5 years ago
mindspore-ci-bot 4c5b9c1ca8 !12833 [MS][LITE][CPU]add erf op
5 years ago
fuzhiye 46d687c9b4 add erf op
5 years ago
mindspore-ci-bot 505bb73436 !12692 add transpose-reshape fusion & same parallel node merge
5 years ago
wangzhe d3b39680f7 format_trans
5 years ago
mindspore-ci-bot e957a1c9b0 !12792 only release npu resources of session
5 years ago
mindspore-ci-bot b126f49fcd !12788 [MS_LITE] fix convert
5 years ago
yefeng 8650362ce5 issue_fix_convert-3
5 years ago
zhaozhenlong b006508c02 npu mgr not single
5 years ago
mindspore-ci-bot ea191d32d4 !12756 [MS][LITE][CPU]implement resize bicubic
5 years ago
fuzhiye 51f9cac595 new implement for resize bicubic
5 years ago
mindspore-ci-bot 08bb46410b !12739 [MS][LITE]fix memory leak
5 years ago
zhangxuetong 8d47a021dc fix memory leak of npu kernel
5 years ago
mindspore-ci-bot b47f6a2cb8 !12707 [MS][LITE]CropAndResize supports 1x1 output case
5 years ago
mindspore-ci-bot 5cc6e53255 !12711 clean code
5 years ago
mindspore-ci-bot 9e43be6ec6 !12713 fix bug in kernel registry: need memset after malloc
5 years ago
hangangqiang 84b1f3cf50 fix bug in kernel registry: need memset after malloc
5 years ago
zhaozhenlong 65b680daeb fix clean code
5 years ago
mindspore-ci-bot 0ba51532db !12698 fix wrapper codex
5 years ago
zengxianglong 4e9fd4814e ResizeAndCrop supports 1x1 case
5 years ago
mindspore-ci-bot aea3af6766 !12697 [MS_LITE] Codex for sec
5 years ago
mindspore-ci-bot 16d3148133 !12694 [MSLITE][Develop] code review
5 years ago
mindspore-ci-bot d4c2ff986d !12689 fix build java gpu error
5 years ago
mindspore-ci-bot bafd7f19ec !12690 [MS][LITE][Develop]fix CodeDEX warnings
5 years ago
zhujingxuan 775fda3e42 fix wrapper codex
5 years ago
yefeng 87ffdff5cb codex_for_sec_1
5 years ago
mindspore-ci-bot 64b4f5be51 !12684 fix codex
5 years ago
sunsuodong ea12c9a411 code review
5 years ago
lixian 997cdd39a3 fix CodeDEX warnings
5 years ago
yeyunpeng 15ef943a2b fix build java gpu bug
5 years ago
zhujingxuan fdd156dd38 fix codex
5 years ago
mindspore-ci-bot 3ccbf6c5e0 !12657 add tf control flow fp16 encoder_0111 model
5 years ago
wangzhe 4fbcc90711 add encoder_0111 fp16 control flow model
5 years ago
mindspore-ci-bot 23ad95f2e3 !12650 fix java bug
5 years ago
yeyunpeng 68b6399cbd fix java bugs
5 years ago
mindspore-ci-bot 0353a7d9af !12636 [MS][LITE][CPU]fix bug
5 years ago
mindspore-ci-bot fde3597599 !12638 [MS][LITE][GPU]fix conv2d transpose bug
5 years ago
mindspore-ci-bot 0e8f371605 !12640 fix encoder control flow fp16 bug
5 years ago
wangzhe 7f490a25f0 debug encoder_control_flow
5 years ago
mindspore-ci-bot f506e0d58c !12620 [MSLITE][Develop] fix bug of npu kernel fusion
5 years ago
mindspore-ci-bot 666995ee4f !12613 [MS_LITE] fix crop fp16
5 years ago
chenzupeng ceb4e46ad4 fix bug in conv2d transpose
5 years ago
fuzhiye ed3e5e3cf4 fix bug of arithmetic fp32 op
5 years ago
yefeng 559b0c8108 fix_fp16_crop
5 years ago
mindspore-ci-bot 531608a17a !12615 [MS][LITE] Support decoder fp16
5 years ago
mindspore-ci-bot 40656394d0 !12610 fix npu mem leak
5 years ago
zhaozhenlong ad40aac408 fix npu memleak delete op const
5 years ago
mindspore-ci-bot 03cf6228fa !12587 Added backend type compile options in run_benchmark_nets.sh
5 years ago
cjh9368 6ffd253b4d [MS][LITE][Develop]support decoder fp16
5 years ago
liujiahan 089d547560 added backend compile option
5 years ago
mindspore-ci-bot 5bdc7a953c !12609 [MS][LITE][CPU]sync pad bug issue
5 years ago
yangruoqi713 cff593d693 [MSLITE][Develop] fix bug of npu kernel fusion
5 years ago
fuzhiye 4b45035f6a fix bug of pad_fp16 op, didn't get correct paddings array
5 years ago
mindspore-ci-bot 9ddc48dae3 !12527 [MS_LITE] build and split
5 years ago
yefeng 82013d31b3 build_split
5 years ago
zhanghaibo5 cfd4ba5ed0 sync with master, commit id: 02737b5e32
5 years ago
zhanghaibo b2bc8356de !12499 sync sec-icsl with master
5 years ago
zhanghaibo 9849ebcb10 !10832 sync sec-icsl with master
5 years ago
mindspore-ci-bot 5373cd2436 !10004 fix thread pool bug
6 years ago
hangangqiang bf86d8c372 fix thread pool bug
6 years ago
mindspore-ci-bot a4e4291d3d !9793 [MD]fix Strip for build
6 years ago
xulei2020 413b40fe6c fix Strip for build
6 years ago
张学同 9e8ac86793 !9771 [MSLITE][Develop] fix code review
6 years ago
sunsuodong 2b2f97b684 fix code review
6 years ago
mindspore-ci-bot 8726127410 !9671 Removing redundant code on icsl
6 years ago
shenwei41 22d7c7ce1c Remove redundant codes on icsl
6 years ago
mindspore-ci-bot 3dbd76182b !9607 [MSLITE][Develop] fix code review
6 years ago
sunsuodong 4c5d184183 fix code review
6 years ago
mindspore-ci-bot d196004273 !9567 modify static check
6 years ago
mindspore-ci-bot b8e6578032 !9572 [MD]fix for codex
6 years ago
mindspore-ci-bot 5723f6ca27 !9569 [MSLITE][Develop] fix code review
6 years ago
yvette 7b568cfe78 modify static check
6 years ago
xulei2020 a5351e1cbd fix for codex
6 years ago
sunsuodong 189e3e39fe fix code review
6 years ago
mindspore-ci-bot 618bb3ff41 !9434 [MD]MD code update for lite
6 years ago
xulei2020 f0620eccfb update MD code
6 years ago
mindspore-ci-bot 175d7b0bbc !9503 add model check for session
6 years ago
mindspore-ci-bot 034144dc0c !9499 [MS][LITE][GPU]check op tensor size
6 years ago
yvette 5fc9eb7f63 add model check for session
6 years ago
chenzupeng be9fec7800 check op tensor size
6 years ago
mindspore-ci-bot 845808e971 !9423 [MS][LITE][GPU]fix bug: input output tensor size not checked
6 years ago
mindspore-ci-bot a00bd62259 !9443 [MS][LITE][Develop] GPU ops Security check
6 years ago
chenzupeng 323b46f1cc fix bug: kernel tensor size not checked
6 years ago
Pengyongrong 313ea3f70f GPU ops Security check
6 years ago
张学同 9df1af7ec2 !9430 [MSLITE][Develop] fix code review
6 years ago
mindspore-ci-bot 252200886c !9427 fix static checking issues of lite ops
6 years ago
sunsuodong cb9ce6068a fix code review
6 years ago
liuwenhao4 3ca8c34b13 fix static checking issues of lite ops
6 years ago
mindspore-ci-bot b6e6d05157 !9384 rm grad op on icsl branch
6 years ago
mindspore-ci-bot 6cf0dbc0d9 !9227 verify shape and index rationality to icsl
6 years ago
mindspore-ci-bot 5aab880cec !9376 [MSLITE][Develop] fix code review
6 years ago
xutianchun 5ace3b0c26 rm grad ops
6 years ago
sunsuodong c5f4f77d21 fix code review
6 years ago
yvette b58802c1cc verify shape and index rationality
6 years ago
mindspore-ci-bot 49ae73d71b !9304 parameter mem save check and comments
6 years ago
mindspore-ci-bot 849b3c1b88 !9265 ops index use at
6 years ago
zhaozhenlong 9ad0dbccad parameter memory save check and comments
6 years ago
zhaozhenlong 011faca343 index use at
6 years ago
mindspore-ci-bot 95b65896cc !9218 [MSLITE][Develop] fix code review
6 years ago
sunsuodong 3dc934349e fix code review
6 years ago
mindspore-ci-bot 135c065132 !9176 [MSLITE][Develop] fix code review
6 years ago
sunsuodong 2c46829b99 fix code review
6 years ago
mindspore-ci-bot 1b31eac495 !9114 [MSLITE][Develop] fix code review
6 years ago
sunsuodong b3f1017e5c fix code review
6 years ago
mindspore-ci-bot b659dd5303 !9073 fix sec check bugs for opencl
6 years ago
wandongdong 24a3508311 fix sec check for opencl
6 years ago
mindspore-ci-bot fba449d4bc !9054 [MSLITE][Develop] fix code review
6 years ago
sunsuodong 8f242a18b3 fix code review
6 years ago
mindspore-ci-bot 59fc574595 !9015 modify static check to icsl
6 years ago
yvette 64a5311c19 modify static check
6 years ago
mindspore-ci-bot 9d47e694f6 !8882 [MSLITE] convert fusion module secure check
6 years ago
mindspore-ci-bot 0c93635f01 !9002 [MSLITE][Develop] fix code review
6 years ago
张学同 1b853a030e !9002 [MSLITE][Develop] fix code review
6 years ago
sunsuodong 18ceac049f fix code review
6 years ago
mindspore-ci-bot 2e276db6a9 !8944 fix code review fp32 int8
6 years ago
mindspore-ci-bot 7d11296249 !8956 modify static check to sec-icsl
6 years ago
yvette 1a520c4d79 modify static check
6 years ago
zhaozhenlong e15a2f1831 fix code review fp32 int8
6 years ago
mindspore-ci-bot 98659b74ed !8914 [MSLITE][Develop] fix code review
6 years ago
sunsuodong 6195f1b3a3 fix code review
6 years ago
mindspore-ci-bot a806c1a71d !8819 modify static check in ./lite/src to icsl
6 years ago
mindspore-ci-bot c9e60551c7 !8856 [lite] fix memory leak and increase robustness for benchmark
6 years ago
yvette e77fe504cf modify static check
6 years ago
mindspore-ci-bot 4214ecd5ec !8866 [MS][LITE] clean for sec-icsl
6 years ago
zhengjun10 4f1ad4d25b convert fusion module secure check
6 years ago
yefeng 60af4c075a clean_sec_5
6 years ago
mindspore-ci-bot 6a8bfd1df4 !8859 【MSLITE】code clean
6 years ago
mindspore-ci-bot 53dd01bdb5 !8820 Modify alarm
6 years ago
wangdongxu f1a8875f56 icsl_icsl
6 years ago
xuanyue fa26eea5ab fix memory leak and increase robustness for benchmark
6 years ago
mindspore-ci-bot f4143adceb !8828 【MSLITE】tools check nullptr sec-icsl
6 years ago
shenwei41 db08b495b3 Alarm modification
6 years ago
mindspore-ci-bot dd371b5c84 !8836 [MSLITE][Develop] fix code review
6 years ago
mindspore-ci-bot 34818bc8a5 !8818 review parameter
6 years ago
mindspore-ci-bot 4afe62a633 !8816 [MS][LITE] fix static check error
6 years ago
jianghui58 9b84e4356d fix static check error
6 years ago
sunsuodong a0cc69a158 fix code review
6 years ago
mindspore-ci-bot c5ef757b9e !8822 fix large functions & fix large Cyclomatic Complexity & remove redundant
6 years ago
mindspore-ci-bot d6bdb55392 !8793 fix review problem
6 years ago
mindspore-ci-bot db3b690cf2 !8723 modify static check to icsl
6 years ago
guohongzilong ada6c2e82c add ptr null check
6 years ago
hangangqiang aa704f51e7 fix large functions & fix large Cyclomatic Complexity & remove redundant
6 years ago
zhaozhenlong 46f6645303 fix code review
6 years ago
yvette b35dcf0648 modify static check
6 years ago
mindspore-ci-bot db0e3281bb !8788 [MSLITE][Develop] fix code review
6 years ago
mindspore-ci-bot e889024b4b !8735 [MSLITE]improve code in tools
6 years ago
mindspore-ci-bot 4e7f812074 !8764 [MS][LITE] static check
6 years ago
guohongzilong a9bf758324 improve code in tolls
6 years ago
sunsuodong f5b27ea767 fix code check
6 years ago
zhaozhenlong bd10bc3fff fp16 kernel review fix
6 years ago
jianghui58 6b1cc553eb static check
6 years ago
mindspore-ci-bot 116e505d89 !8710 modify static check
6 years ago
yvette d2a4fb39be modify static check
6 years ago
mindspore-ci-bot c7850fd77a !8731 adjust index check to entrance
6 years ago
mindspore-ci-bot 50dd8e874d !8729 remove train code
6 years ago
xutianchun 758b83535d rm nnal/fp32_grad
6 years ago
zhaozhenlong 4aeff1717d transpose index check adjust to entrance
6 years ago
mindspore-ci-bot cea7f48543 !8701 fix code review issue
6 years ago
mindspore-ci-bot 919608bc0e !8626 target link optimize & fp16 to lite
6 years ago
zhaozhenlong 9197116280 fix code review issue
6 years ago
yeyunpeng 0165388b1f target link optimize & fp16 to lite
6 years ago
mindspore-ci-bot db801ae4b7 !8391 fix code review comments
6 years ago
mindspore-ci-bot 9ed4140b0c !8530 move compareOutputData to /test
6 years ago
mindspore-ci-bot 8b18961e60 !8499 [MSLITE][Develop] fix code check
6 years ago
mindspore-ci-bot 6f0c6d7ab0 !8413 modify static check for icsl
6 years ago
zhanghaibo5 8e611c0664 fix code review comments
6 years ago
mindspore-ci-bot 050b4b3a35 !8486 fix static checking of lite ops
6 years ago
sunsuodong 3f89166954 fix code check
6 years ago
liuyu 98aa985390 move compareOutputData to /test
6 years ago
mindspore-ci-bot c24e49f02c !8523 remove train
6 years ago
yvette ad62e15fdd modify static check
6 years ago
xutianchun 754bb016ba remove train on icsl
6 years ago
mindspore-ci-bot d211502934 !8551 add commonts for icsl
6 years ago
liuwenhao4 4109baec5a fix static checking of lite ops
6 years ago
yvette 7a0622d48f add commonts
6 years ago
mindspore-ci-bot 39df4712f7 !8525 sec gate
6 years ago
zhaozhenlong e23748da1b add comments
6 years ago
mindspore-ci-bot 8fa6127d8c !8473 [MSLITE]fix train mode in package_lite.cmake sec
6 years ago
guohongzilong d7b1bbf9d8 fix train mode in package_lite.cmake
6 years ago
张学同 34d6627404 !8424 【MSLITE】fix dequant memory bug sec-icsi
6 years ago
guohongzilong 93efbdf79f fix dequant memory invalid write
6 years ago
wandongdong 9a029738eb !8401 fix sec check for opencl runtime and allocator
6 years ago
sunsuodong b595454b96 !8345 [MSLITE][Develop] fix code
6 years ago

@ -9,9 +9,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/options.cmake)
include(${CMAKE_SOURCE_DIR}/cmake/check_requirements.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
if(NOT ENABLE_GLIBCXX)
add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0)
endif()
add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@ -51,7 +49,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/flatbuffers/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/flatbuffers/include/flatbuffers)
include(${CMAKE_SOURCE_DIR}/cmake/dependency_utils.cmake)
find_package(Python3 COMPONENTS Interpreter Development)
find_package(Python3 3.7 COMPONENTS Interpreter Development)
if(Python3_FOUND)
set(PYTHON_INCLUDE_DIRS "${Python3_INCLUDE_DIRS}")
set(PYTHON_LIBRARIES "${Python3_LIBRARIES}")

@ -30,24 +30,23 @@ For individual contributor, please refer to [ICLA online document](https://www.m
Please follow this style to make MindSpore easy to review, maintain and develop.
- Coding guidelines
* Coding guidelines
The *Python* coding style suggested by [Python PEP 8 Coding Style](https://pep8.org/) and *C++* coding style suggested by [Google C++ Coding Guidelines](http://google.github.io/styleguide/cppguide.html) are used in MindSpore community.
- Unittest guidelines
* Unittest guidelines
The *Python* unittest style suggested by [pytest](http://www.pytest.org/en/latest/) and *C++* unittest style suggested by [Googletest Primer](https://github.com/google/googletest/blob/master/docs/primer.md) are used in MindSpore community.
### Fork-Pull development model
- Fork MindSpore repository
* Fork MindSpore repository
Before submitting code to MindSpore project, please make sure that this project have been forked to your own repository. It means that there will be parallel development between MindSpore repository and your own repository, so be careful to avoid the inconsistency between them.
- Clone the remote repository
* Clone the remote repository
If you want to download the code to the local machine, `git` is the best way:
```shell
# For GitHub
git clone https://github.com/{insert_your_forked_repo}/mindspore.git
@ -57,20 +56,18 @@ Please follow this style to make MindSpore easy to review, maintain and develop.
git remote add upstream https://gitee.com/mindspore/mindspore.git
```
- Develop code locally
* Develop code locally
To avoid inconsistency between multiple branches, checking out to a new branch is `SUGGESTED`:
```shell
git checkout -b {new_branch_name} origin/master
```
Then you can change the code arbitrarily.
- Push the code to the remote repository
* Push the code to the remote repository
After updating the code, you should push the update in the formal way:
```shell
git add .
git status # Check the update status
@ -79,7 +76,7 @@ Please follow this style to make MindSpore easy to review, maintain and develop.
git push origin {new_branch_name}
```
- Pull a request to MindSpore repository
* Pull a request to MindSpore repository
In the last step, your need to pull a compare request between your new branch and MindSpore `master` branch. After finishing the pull request, the Jenkins CI will be automatically set up for building test.
@ -104,11 +101,11 @@ When reporting issues, refer to this format:
### Propose PRs
- Raise your idea as an *issue* on [GitHub](https://github.com/mindspore-ai/mindspore/issues) or [Gitee](https://gitee.com/mindspore/mindspore/issues)
- If it is a new feature that needs lots of design details, a design proposal should also be submitted.
- After reaching consensus in the issue discussions and design proposal reviews, complete the development on the forked repo and submit a PR.
- None of PRs is not permitted until it receives **2+ LGTM** from approvers. Please NOTICE that approver is NOT allowed to add *LGTM* on his own PR.
- After PR is sufficiently discussed, it will get merged, abandoned or rejected depending on the outcome of the discussion.
* Raise your idea as an *issue* on [GitHub](https://github.com/mindspore-ai/mindspore/issues) or [Gitee](https://gitee.com/mindspore/mindspore/issues)
* If it is a new feature that needs lots of design details, a design proposal should also be submitted.
* After reaching consensus in the issue discussions and design proposal reviews, complete the development on the forked repo and submit a PR.
* None of PRs is not permitted until it receives **2+ LGTM** from approvers. Please NOTICE that approver is NOT allowed to add *LGTM* on his own PR.
* After PR is sufficiently discussed, it will get merged, abandoned or rejected depending on the outcome of the discussion.
**PRs advisory:**

@ -1,4 +1,4 @@
![MindSpore Logo](https://gitee.com/mindspore/mindspore/raw/master/docs/MindSpore-logo.png "MindSpore logo")
![MindSpore Logo](docs/MindSpore-logo.png "MindSpore logo")
[查看中文](./README_CN.md)
@ -34,7 +34,7 @@ processor, and software hardware co-optimization. At the meantime MindSpore as
a global AI open source community, aims to further advance the development and
enrichment of the AI software/hardware application ecosystem.
<img src="https://gitee.com/mindspore/mindspore/raw/master/docs/MindSpore-architecture.png" alt="MindSpore Architecture" width="600"/>
<img src="docs/MindSpore-architecture.png" alt="MindSpore Architecture" width="600"/>
For more details please check out our [Architecture Guide](https://www.mindspore.cn/doc/note/en/master/design/mindspore/architecture.html).
@ -50,7 +50,7 @@ TensorFlow adopted static calculation diagrams in the early days, whereas PyTorc
But MindSpore finds another way, automatic differentiation based on source code conversion. On the one hand, it supports automatic differentiation of automatic control flow, so it is quite convenient to build models like PyTorch. On the other hand, MindSpore can perform static compilation optimization on neural networks to achieve great performance.
<img src="https://gitee.com/mindspore/mindspore/raw/master/docs/Automatic-differentiation.png" alt="Automatic Differentiation" width="600"/>
<img src="docs/Automatic-differentiation.png" alt="Automatic Differentiation" width="600"/>
The implementation of MindSpore automatic differentiation can be understood as the symbolic differentiation of the program itself. Because MindSpore IR is a functional intermediate expression, it has an intuitive correspondence with the composite function in basic algebra. The derivation formula of the composite function composed of arbitrary basic functions can be derived. Each primitive operation in MindSpore IR can correspond to the basic functions in basic algebra, which can build more complex flow control.
@ -58,9 +58,9 @@ The implementation of MindSpore automatic differentiation can be understood as t
The goal of MindSpore automatic parallel is to build a training method that combines data parallelism, model parallelism, and hybrid parallelism. It can automatically select a least cost model splitting strategy to achieve automatic distributed parallel training.
<img src="https://gitee.com/mindspore/mindspore/raw/master/docs/Automatic-parallel.png" alt="Automatic Parallel" width="600"/>
<img src="docs/Automatic-parallel.png" alt="Automatic Parallel" width="600"/>
At present, MindSpore uses a fine-grained parallel strategy of splitting operators, that is, each operator in the figure is split into a cluster to complete parallel operations. The splitting strategy during this period may be very complicated, but as a developer advocating Pythonic, you don't need to care about the underlying implementation, as long as the top-level API compute is efficient.
At present, MindSpore uses a fine-grained parallel strategy of splitting operators, that is, each operator in the figure is splitted into a cluster to complete parallel operations. The splitting strategy during this period may be very complicated, but as a developer advocating Pythonic, you don't need to care about the underlying implementation, as long as the top-level API compute is efficient.
## Installation
@ -85,7 +85,7 @@ For installation using `pip`, take `CPU` and `Ubuntu-x86` build version as an ex
1. Download whl from [MindSpore download page](https://www.mindspore.cn/versions/en), and install the package.
```bash
pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.2.0-rc1/MindSpore/cpu/ubuntu_x86/mindspore-1.2.0rc1-cp37-cp37m-linux_x86_64.whl
pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.0/MindSpore/cpu/ubuntu_x86/mindspore-1.1.0-cp37-cp37m-linux_x86_64.whl
```
2. Run the following command to verify the install.
@ -229,7 +229,7 @@ currently the containerized build options are supported as follows:
```
If you want to learn more about the building process of MindSpore docker images,
please check out [docker](https://gitee.com/mindspore/mindspore/blob/master/docker/README.md) repo for the details.
please check out [docker](docker/README.md) repo for the details.
## Quickstart
@ -256,13 +256,12 @@ Check out how MindSpore Open Governance [works](https://gitee.com/mindspore/comm
## Contributing
Welcome contributions. See our [Contributor Wiki](https://gitee.com/mindspore/mindspore/blob/master/CONTRIBUTING.md) for
Welcome contributions. See our [Contributor Wiki](CONTRIBUTING.md) for
more details.
## Maintenance phases
Project stable branches will be in one of the following states:
| **State** | **Time frame** | **Summary** |
|-------------|---------------|--------------------------------------------------|
| Planning | 1 - 3 months | Features are under planning. |
@ -287,8 +286,8 @@ Project stable branches will be in one of the following states:
## Release Notes
The release notes, see our [RELEASE](https://gitee.com/mindspore/mindspore/blob/master/RELEASE.md).
The release notes, see our [RELEASE](RELEASE.md).
## License
[Apache License 2.0](https://gitee.com/mindspore/mindspore#/mindspore/mindspore/blob/master/LICENSE)
[Apache License 2.0](LICENSE)

@ -1,4 +1,4 @@
![MindSpore标志](https://gitee.com/mindspore/mindspore/raw/master/docs/MindSpore-logo.png "MindSpore logo")
![MindSpore标志](docs/MindSpore-logo.png "MindSpore logo")
[View English](./README.md)
@ -31,7 +31,7 @@ MindSpore提供了友好的设计和高效的执行旨在提升数据科学
同时MindSpore作为全球AI开源社区致力于进一步开发和丰富AI软硬件应用生态。
<img src="https://gitee.com/mindspore/mindspore/raw/master/docs/MindSpore-architecture.png" alt="MindSpore Architecture" width="600"/>
<img src="docs/MindSpore-architecture.png" alt="MindSpore Architecture" width="600"/>
欲了解更多详情,请查看我们的[总体架构](https://www.mindspore.cn/doc/note/zh-CN/master/design/mindspore/architecture.html)。
@ -47,7 +47,7 @@ TensorFlow早期采用的是静态计算图PyTorch采用的是动态计算图
MindSpore找到了另一种方法即基于源代码转换的自动微分。一方面它支持自动控制流的自动微分因此像PyTorch这样的模型构建非常方便。另一方面MindSpore可以对神经网络进行静态编译优化以获得更好的性能。
<img src="https://gitee.com/mindspore/mindspore/raw/master/docs/Automatic-differentiation.png" alt="Automatic Differentiation" width="600"/>
<img src="docs/Automatic-differentiation.png" alt="Automatic Differentiation" width="600"/>
MindSpore自动微分的实现可以理解为程序本身的符号微分。MindSpore IR是一个函数中间表达式它与基础代数中的复合函数具有直观的对应关系。复合函数的公式由任意可推导的基础函数组成。MindSpore IR中的每个原语操作都可以对应基础代数中的基本功能从而可以建立更复杂的流控制。
@ -55,7 +55,7 @@ MindSpore自动微分的实现可以理解为程序本身的符号微分。MindS
MindSpore自动并行的目的是构建数据并行、模型并行和混合并行相结合的训练方法。该方法能够自动选择开销最小的模型切分策略实现自动分布并行训练。
<img src="https://gitee.com/mindspore/mindspore/raw/master/docs/Automatic-parallel.png" alt="Automatic Parallel" width="600"/>
<img src="docs/Automatic-parallel.png" alt="Automatic Parallel" width="600"/>
目前MindSpore采用的是算子切分的细粒度并行策略即图中的每个算子被切分为一个集群完成并行操作。在此期间的切分策略可能非常复杂但是作为一名Python开发者您无需关注底层实现只要顶层API计算是有效的即可。
@ -82,7 +82,7 @@ MindSpore提供跨多个后端的构建选项
1. 请从[MindSpore下载页面](https://www.mindspore.cn/versions)下载并安装whl包。
```bash
pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.2.0-rc1/MindSpore/cpu/ubuntu_x86/mindspore-1.2.0rc1-cp37-cp37m-linux_x86_64.whl
pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.0/MindSpore/cpu/ubuntu_x86/mindspore-1.1.0-cp37-cp37m-linux_x86_64.whl
```
2. 执行以下命令,验证安装结果。
@ -225,7 +225,7 @@ MindSpore的Docker镜像托管在[Docker Hub](https://hub.docker.com/r/mindspore
[ 2. 2. 2. 2.]]]
```
如果您想了解更多关于MindSpore Docker镜像的构建过程请查看[docker](https://gitee.com/mindspore/mindspore/blob/master/docker/README.md) repo了解详细信息。
如果您想了解更多关于MindSpore Docker镜像的构建过程请查看[docker](docker/README.md) repo了解详细信息。
## 快速入门
@ -250,12 +250,11 @@ MindSpore的Docker镜像托管在[Docker Hub](https://hub.docker.com/r/mindspore
## 贡献
欢迎参与贡献。更多详情,请参阅我们的[贡献者Wiki](https://gitee.com/mindspore/mindspore/blob/master/CONTRIBUTING.md)。
欢迎参与贡献。更多详情,请参阅我们的[贡献者Wiki](CONTRIBUTING.md)。
## 分支维护策略
MindSpore的版本分支有以下几种维护阶段
| **状态** | **持续时间** | **说明** |
|-------------|---------------|--------------------------------------------------|
| Planning | 1 - 3 months | 特性规划。 |
@ -280,8 +279,8 @@ MindSpore的版本分支有以下几种维护阶段
## 版本说明
版本说明请参阅[RELEASE](https://gitee.com/mindspore/mindspore/blob/master/RELEASE.md)。
版本说明请参阅[RELEASE](RELEASE.md)。
## 许可证
[Apache License 2.0](https://gitee.com/mindspore/mindspore#/mindspore/mindspore/blob/master/LICENSE)
[Apache License 2.0](LICENSE)

File diff suppressed because it is too large Load Diff

2
akg

@ -1 +1 @@
Subproject commit e7a391c51e66975d46bacf6425ae8f27e1675f85
Subproject commit 46f4c28fcf2ad719f3d360a9a6dc1a7fd75d130c

@ -26,12 +26,16 @@ set VERSION_MAJOR=''
set VERSION_MINOR=''
set ERSION_REVISION=''
for /f "delims=\= tokens=2" %%a in ('findstr /C:"const int ms_version_major = " mindspore\lite\include\version.h') do (set x=%%a)
find "const int ms_version_major =" mindspore\lite\include\version.h > version.txt
for /f "delims=\= tokens=2" %%a in ('findstr "const int ms_version_major = " version.txt') do (set x=%%a)
set VERSION_MAJOR=%x:~1,1%
for /f "delims=\= tokens=2" %%b in ('findstr /C:"const int ms_version_minor = " mindspore\lite\include\version.h') do (set y=%%b)
find "const int ms_version_minor =" mindspore\lite\include\version.h > version.txt
for /f "delims=\= tokens=2" %%b in ('findstr "const int ms_versio/retestn_minor = " version.txt') do (set y=%%b)
set VERSION_MINOR=%y:~1,1%
for /f "delims=\= tokens=2" %%c in ('findstr /C:"const int ms_version_revision = " mindspore\lite\include\version.h') do (set z=%%c)
find "const int ms_version_revision =" mindspore\lite\include\version.h > version.txt
for /f "delims=\= tokens=2" %%c in ('findstr "const int ms_version_revision = " version.txt') do (set z=%%c)
set VERSION_REVISION=%z:~1,1%
del version.txt
echo "======Start building MindSpore Lite %VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_REVISION%======"
@ -74,8 +78,6 @@ IF NOT EXIST "%BUILD_PATH%/mindspore" (
cd %BUILD_PATH%/mindspore
IF "%1%" == "lite" (
cmake --build "%BUILD_PATH%\mindspore" --target clean
rd /s /q "%BASE_PATH%\output"
(git log -1 | findstr "^commit") > %BUILD_PATH%\.commit_id
cmake -DPLATFORM_ARM64=off -DSUPPORT_TRAIN=off ^
-DENABLE_TOOLS=on -DENABLE_CONVERTER=on -DBUILD_TESTCASES=off ^

@ -25,7 +25,7 @@ usage()
echo "bash build.sh [-d] [-r] [-v] [-c on|off] [-t ut|st] [-g on|off] [-h] [-b ge] [-m infer|train] \\"
echo " [-a on|off] [-p on|off] [-i] [-L] [-R] [-D on|off] [-j[n]] [-e gpu|ascend|cpu|npu] \\"
echo " [-P on|off] [-z [on|off]] [-M on|off] [-V 9.2|10.1|310|910] [-I arm64|arm32|x86_64] [-K] \\"
echo " [-B on|off] [-E] [-l on|off] [-n full|lite|off] [-T on|off] [-H on|off] \\"
echo " [-B on|off] [-E] [-l on|off] [-n full|lite|off] [-T on|off] \\"
echo " [-A [cpp|java|object-c] [-C on|off] [-o on|off] [-S on|off] [-k on|off] [-W sse|neon|avx|off] \\"
echo ""
echo "Options:"
@ -64,7 +64,6 @@ usage()
echo " -S Enable enable download cmake compile dependency from gitee , default off"
echo " -k Enable make clean, clean up compilation generated cache "
echo " -W Enable x86_64 SSE or AVX instruction set, use [sse|avx|neon|off], default off"
echo " -H Enable hidden"
}
# check value of input is 'on' or 'off'
@ -122,10 +121,9 @@ checkopts()
DEVICE_VERSION=""
DEVICE=""
ENABLE_NPU="off"
ENABLE_HIDDEN="on"
LITE_ENABLE_GPU=""
# Process the options
while getopts 'drvj:c:t:hsb:a:g:p:ie:m:l:I:LRP:D:zM:V:K:B:En:T:A:C:o:S:k:W:H:' opt
while getopts 'drvj:c:t:hsb:a:g:p:ie:m:l:I:LRP:D:zM:V:K:B:En:T:A:C:o:S:k:W:' opt
do
OPTARG=$(echo ${OPTARG} | tr '[A-Z]' '[a-z]')
case "${opt}" in
@ -334,11 +332,6 @@ checkopts()
X86_64_SIMD="$OPTARG"
fi
;;
H)
check_on_off $OPTARG H
ENABLE_HIDDEN="$OPTARG"
echo "${OPTARG} hidden"
;;
*)
echo "Unknown option ${opt}!"
usage
@ -357,11 +350,15 @@ checkopts()
if [[ "X$DEVICE_VERSION" == "X" ]]; then
DEVICE_VERSION=10.1
fi
if [[ "X$DEVICE_VERSION" != "X11.1" && "X$DEVICE_VERSION" != "X10.1" ]]; then
if [[ "X$DEVICE_VERSION" != "X9.2" && "X$DEVICE_VERSION" != "X10.1" ]]; then
echo "Invalid value ${DEVICE_VERSION} for option -V"
usage
exit 1
fi
if [[ "X$DEVICE_VERSION" == "X9.2" ]]; then
echo "Unsupported CUDA version 9.2"
exit 1
fi
CUDA_VERSION="$DEVICE_VERSION"
elif [[ "X$DEVICE" == "Xd" || "X$DEVICE" == "Xascend" ]]; then
# version default 910
@ -534,7 +531,6 @@ write_commit_file() {
build_lite()
{
rm -rf ${BASEPATH}/output/*
get_version
echo "============ Start building MindSpore Lite ${VERSION_STR} ============"
local LOCAL_LITE_PLATFORM=${LITE_PLATFORM}
@ -665,17 +661,11 @@ build_lite_java_arm64() {
mkdir -p ${JAVA_PATH}/java/app/libs/arm64-v8a/
mkdir -p ${JAVA_PATH}/native/libs/arm64-v8a/
if [[ "X$SUPPORT_TRAIN" = "Xon" ]]; then
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/lib/libminddata-lite.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/lib/libminddata-lite.so ${JAVA_PATH}/native/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/third_party/libjpeg-turbo/lib/*.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/third_party/libjpeg-turbo/lib/*.so ${JAVA_PATH}/native/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/arm64-v8a/
else
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/inference/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/inference/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/arm64-v8a/
fi
[ -n "${VERSION_STR}" ] && rm -rf ${JTARBALL}
}
@ -697,32 +687,21 @@ build_lite_java_arm32() {
mkdir -p ${JAVA_PATH}/java/app/libs/armeabi-v7a/
mkdir -p ${JAVA_PATH}/native/libs/armeabi-v7a/
if [[ "X$SUPPORT_TRAIN" = "Xon" ]]; then
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/lib/libminddata-lite.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/lib/libminddata-lite.so ${JAVA_PATH}/native/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/third_party/libjpeg-turbo/lib/*.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/third_party/libjpeg-turbo/lib/*.so ${JAVA_PATH}/native/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/armeabi-v7a/
else
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/inference/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/inference/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/armeabi-v7a/
fi
[ -n "${VERSION_STR}" ] && rm -rf ${JTARBALL}
}
build_lite_java_x86() {
# build mindspore-lite x86
local inference_or_train=inference
if [[ "X$SUPPORT_TRAIN" = "Xon" ]]; then
inference_or_train=train
fi
if [[ "$X86_64_SIMD" == "sse" || "$X86_64_SIMD" == "avx" ]]; then
local JTARBALL=mindspore-lite-${VERSION_STR}-${inference_or_train}-linux-x64-${X86_64_SIMD}
local JTARBALL=mindspore-lite-${VERSION_STR}-inference-linux-x64-${X86_64_SIMD}
else
local JTARBALL=mindspore-lite-${VERSION_STR}-${inference_or_train}-linux-x64
local JTARBALL=mindspore-lite-${VERSION_STR}-inference-linux-x64
fi
if [[ "X$INC_BUILD" == "Xoff" ]] || [[ ! -f "${BASEPATH}/mindspore/lite/build/java/${JTARBALL}.tar.gz" ]]; then
build_lite "x86_64" "off" ""
@ -734,20 +713,8 @@ build_lite_java_x86() {
[ -n "${JAVA_PATH}" ] && rm -rf ${JAVA_PATH}/java/linux_x86/libs/
mkdir -p ${JAVA_PATH}/java/linux_x86/libs/
mkdir -p ${JAVA_PATH}/native/libs/linux_x86/
if [[ "X$SUPPORT_TRAIN" = "Xon" ]]; then
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/lib/libmindspore-lite.so ${JAVA_PATH}/java/linux_x86/libs/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/linux_x86/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/lib/libminddata-lite.so ${JAVA_PATH}/java/linux_x86/libs/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/lib/libminddata-lite.so ${JAVA_PATH}/native/libs/linux_x86/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/third_party/libjpeg-turbo/lib/*.so* ${JAVA_PATH}/java/linux_x86/libs/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/train/minddata/third_party/libjpeg-turbo/lib/*.so* ${JAVA_PATH}/native/libs/linux_x86/
else
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/inference/lib/libmindspore-lite.so ${JAVA_PATH}/java/linux_x86/libs/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/inference/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/linux_x86/
fi
[ -n "${VERSION_STR}" ] && rm -rf ${JTARBALL}
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/java/linux_x86/libs/
cp ${BASEPATH}/mindspore/lite/build/java/${JTARBALL}/lib/libmindspore-lite.so ${JAVA_PATH}/native/libs/linux_x86/
}
build_jni_arm64() {
@ -801,7 +768,7 @@ build_jni_x86_64() {
mkdir -pv java/jni
cd java/jni
cmake -DMS_VERSION_MAJOR=${VERSION_MAJOR} -DMS_VERSION_MINOR=${VERSION_MINOR} -DMS_VERSION_REVISION=${VERSION_REVISION} \
-DENABLE_VERBOSE=${ENABLE_VERBOSE} -DSUPPORT_TRAIN=${SUPPORT_TRAIN} "${JAVA_PATH}/native/"
-DENABLE_VERBOSE=${ENABLE_VERBOSE} "${JAVA_PATH}/native/"
make -j$THREAD_NUM
if [[ $? -ne 0 ]]; then
echo "---------------- mindspore lite: build jni x86_64 failed----------------"
@ -850,16 +817,11 @@ build_java() {
cd ${JAVA_PATH}/java/app/build
zip -r mindspore-lite-maven-${VERSION_STR}.zip mindspore
local inference_or_train=inference
if [[ "X$SUPPORT_TRAIN" = "Xon" ]]; then
inference_or_train=train
fi
# build linux x86 jar
if [[ "$X86_64_SIMD" == "sse" || "$X86_64_SIMD" == "avx" ]]; then
local LINUX_X86_PACKAGE_NAME=mindspore-lite-${VERSION_STR}-${inference_or_train}-linux-x64-${X86_64_SIMD}-jar
local LINUX_X86_PACKAGE_NAME=mindspore-lite-${VERSION_STR}-inference-linux-x64-${X86_64_SIMD}-jar
else
local LINUX_X86_PACKAGE_NAME=mindspore-lite-${VERSION_STR}-${inference_or_train}-linux-x64-jar
local LINUX_X86_PACKAGE_NAME=mindspore-lite-${VERSION_STR}-inference-linux-x64-jar
fi
check_java_home
build_lite_java_x86
@ -873,17 +835,15 @@ build_java() {
gradle releaseJar
# install and package
mkdir -p ${JAVA_PATH}/java/linux_x86/build/lib
cp ${JAVA_PATH}/java/linux_x86/libs/*.so* ${JAVA_PATH}/java/linux_x86/build/lib/jar
cp ${JAVA_PATH}/java/linux_x86/libs/*.so ${JAVA_PATH}/java/linux_x86/build/lib/jar
cd ${JAVA_PATH}/java/linux_x86/build/
cp -r ${JAVA_PATH}/java/linux_x86/build/lib ${JAVA_PATH}/java/linux_x86/build/${LINUX_X86_PACKAGE_NAME}
tar czvf ${LINUX_X86_PACKAGE_NAME}.tar.gz ${LINUX_X86_PACKAGE_NAME}
# copy output
cp ${JAVA_PATH}/java/app/build/mindspore-lite-maven-${VERSION_STR}.zip ${BASEPATH}/output
cp ${LINUX_X86_PACKAGE_NAME}.tar.gz ${BASEPATH}/output
cd ${BASEPATH}/output
[ -n "${VERSION_STR}" ] && rm -rf ${BASEPATH}/mindspore/lite/build/java/mindspore-lite-${VERSION_STR}-${inference_or_train}-linux-x64
[ -n "${VERSION_STR}" ] && rm -rf ${BASEPATH}/mindspore/lite/build/java/mindspore-lite-${VERSION_STR}-inference-linux-x64
exit 0
}

@ -1,4 +1,4 @@
## define customized find functions, print customized error messages
## define customized find fucntions, print customized error messages
function(find_required_package pkg_name)
find_package(${pkg_name})
if(NOT ${pkg_name}_FOUND)
@ -24,7 +24,7 @@ if(Python3_FOUND)
message("Python3 library path: ${Python3_LIBRARY}")
message("Python3 interpreter: ${Python3_EXECUTABLE}")
elseif(Python3_LIBRARY AND Python3_EXECUTABLE AND
${Python3_VERSION} VERSION_GREATER_EQUAL "3.7.0" AND ${Python3_VERSION} VERSION_LESS "3.9.9")
${Python3_VERSION} VERSION_GREATER_EQUAL "3.7.0" AND ${Python3_VERSION} VERSION_LESS "3.8.9")
message(WARNING "Maybe python3 environment is broken.")
message("Python3 library path: ${Python3_LIBRARY}")
message("Python3 interpreter: ${Python3_EXECUTABLE}")
@ -56,6 +56,10 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
find_required_program(tclsh)
endif()
if(MS_BUILD_GRPC)
find_required_package(OpenSSL)
endif()
## packages used in GPU mode only
if(ENABLE_GPU)
find_library(gmp_LIB gmp)

@ -19,17 +19,15 @@ endfunction()
if(ENABLE_D OR ENABLE_ACL OR ENABLE_TESTCASES)
set(_ge_tmp_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(_ge_tmp_ENABLE_GITEE ${ENABLE_GITEE})
set(_ge_tmp_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
set(ENABLE_GITEE ON)
set(CMAKE_INSTALL_PREFIX ${BUILD_PATH}/graphengine)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILE__='\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"' \
-Wno-builtin-macro-redefined")
if(ENABLE_TESTCASES)
# use slog, error manager, mmpa in non ascend mode, e.g. tests
set(GE_PREBUILD_PATH ${GE_SOURCE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR})
set(ENABLE_MS_TESTCASES TRUE)
find_submodule_lib(slog libalog.so ${GE_PREBUILD_PATH})
find_submodule_lib(error_manager liberror_manager.so ${GE_PREBUILD_PATH})
find_submodule_lib(static_mmpa libmmpa.a ${GE_PREBUILD_PATH})
endif()
@ -37,7 +35,6 @@ if(ENABLE_D OR ENABLE_ACL OR ENABLE_TESTCASES)
add_subdirectory(${GE_SOURCE_DIR})
set(CMAKE_INSTALL_PREFIX ${_ge_tmp_CMAKE_INSTALL_PREFIX})
set(ENABLE_GITEE ${_ge_tmp_ENABLE_GITEE})
set(CMAKE_CXX_FLAGS ${_ge_tmp_CMAKE_CXX_FLAGS})
else()
message(FATAL_ERROR "No compile option defined for GraphEngine, exiting")
endif()

@ -17,8 +17,7 @@ if(NOT TARGET gtest)
set(CMAKE_MACOSX_RPATH TRUE)
set(CMAKE_CXX_FLAGS "${SECURE_CXX_FLAGS}")
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.0"
AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64" AND SYSTEM_TYPE MATCHES "euleros")
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.0" AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64" AND SYSTEM_TYPE MATCHES "euleros")
# -D_GLIBCXX_USE_CXX11_ABI=0 added for the ABI incompatible for libtsdclient.so
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()

@ -86,10 +86,8 @@ function(ms_protobuf_generate_py c_var h_var py_var)
COMMAND protobuf::protoc -I${file_dir} --cpp_out=${CMAKE_BINARY_DIR}/${rel_path} ${abs_file}
COMMAND protobuf::protoc -I${file_dir} --python_out=${CMAKE_BINARY_DIR}/${rel_path} ${abs_file}
COMMAND protobuf::protoc -I${file_dir} --python_out=${CMAKE_BINARY_DIR}/${rel_path} ${abs_file}
COMMAND perl -pi -e "s/import (.+_pb2.*)/from . import \\1/"
"${CMAKE_BINARY_DIR}/${rel_path}/${file_name}_pb2.py"
COMMAND cp "${CMAKE_BINARY_DIR}/${rel_path}/${file_name}_pb2.py"
"${PROJECT_SOURCE_DIR}/mindspore/train/"
COMMAND perl -pi -e "s/import (.+_pb2.*)/from . import \\1/" "${CMAKE_BINARY_DIR}/${rel_path}/${file_name}_pb2.py"
COMMAND cp "${CMAKE_BINARY_DIR}/${rel_path}/${file_name}_pb2.py" "${PROJECT_SOURCE_DIR}/mindspore/train/"
DEPENDS protobuf::protoc ${abs_file}
COMMENT "Running C++ protocol buffer compiler on ${file}" VERBATIM)
endforeach()

@ -17,8 +17,7 @@ function(find_python_package out_inc out_lib)
set(${out_inc} ${inc} PARENT_SCOPE)
execute_process(
COMMAND "${PYTHON_EXECUTABLE}" -c "import distutils.sysconfig as sysconfig; import os; \
print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LDLIBRARY')))"
COMMAND "${PYTHON_EXECUTABLE}" -c "import distutils.sysconfig as sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LDLIBRARY')))"
RESULT_VARIABLE result
OUTPUT_VARIABLE lib)
string(STRIP "${lib}" lib)

@ -63,8 +63,11 @@ function(ms_build_flatbuffers source_schema_files
endif()
endfunction()
function(ms_build_flatbuffers_lite
source_schema_files source_schema_dirs custom_target_name generated_output_dir if_inner)
function(ms_build_flatbuffers_lite source_schema_files
source_schema_dirs
custom_target_name
generated_output_dir
if_inner)
set(total_schema_dirs "")
set(total_generated_files "")

@ -1,15 +1,5 @@
set(glog_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2 ${SECURE_CXX_FLAGS} -Dgoogle=mindspore_private")
set(glog_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2 ${SECURE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
set(glog_CFLAGS "-D_FORTIFY_SOURCE=2 -O2")
if(NOT ENABLE_GLIBCXX)
set(glog_CXXFLAGS "${glog_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()
if(BUILD_LITE)
set(glog_patch "")
set(glog_lib glog)
else()
set(glog_patch ${CMAKE_SOURCE_DIR}/third_party/patch/glog/glog.patch001)
set(glog_lib mindspore_glog)
endif()
if(ENABLE_GITEE)
set(REQ_URL "https://gitee.com/mirrors/glog/repository/archive/v0.4.0.tar.gz")
set(MD5 "22fe340ddc231e6c8e46bc295320f8ee")
@ -17,13 +7,11 @@ else()
set(REQ_URL "https://github.com/google/glog/archive/v0.4.0.tar.gz")
set(MD5 "0daea8785e6df922d7887755c3d100d0")
endif()
mindspore_add_pkg(glog
VER 0.4.0
LIBS ${glog_lib}
LIBS glog
URL ${REQ_URL}
MD5 ${MD5}
PATCHES ${glog_patch}
CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON -DWITH_GFLAGS=OFF)
include_directories(${glog_INC})
add_library(mindspore::glog ALIAS glog::${glog_lib})
add_library(mindspore::glog ALIAS glog::glog)

@ -1,16 +1,10 @@
set(grpc_USE_STATIC_LIBS ON)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(grpc_CXXFLAGS "-fstack-protector-all -Wno-uninitialized -Wno-unused-parameter -fPIC \
-fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2")
set(grpc_CXXFLAGS "-fstack-protector-all -Wno-uninitialized -Wno-unused-parameter -fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(grpc_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter \
-fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2")
set(grpc_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2")
else()
set(grpc_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter \
-fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2")
if(NOT ENABLE_GLIBCXX)
set(grpc_CXXFLAGS "${grpc_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()
set(grpc_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
endif()
set(grpc_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
@ -30,8 +24,9 @@ else()
endif()
message("grpc using absl_DIR : " ${_FINDPACKAGE_ABSL_CONFIG_DIR})
if(EXISTS ${openssl_ROOT})
set(_CMAKE_ARGS_OPENSSL_ROOT_DIR "-DOPENSSL_ROOT_DIR:PATH=${openssl_ROOT}")
set(_CMAKE_ARGS_OPENSSL_ROOT_DIR "")
if(OPENSSL_ROOT_DIR)
set(_CMAKE_ARGS_OPENSSL_ROOT_DIR "-DOPENSSL_ROOT_DIR:PATH=${OPENSSL_ROOT_DIR}")
endif()
if(ENABLE_GITEE)
@ -76,7 +71,10 @@ target_link_libraries(grpc::grpc++ INTERFACE mindspore::z)
target_link_libraries(grpc::grpc++ INTERFACE mindspore::cares)
target_link_libraries(grpc::grpc++ INTERFACE mindspore::absl_strings mindspore::absl_throw_delegate
mindspore::absl_raw_logging_internal mindspore::absl_int128 mindspore::absl_bad_optional_access)
target_link_libraries(grpc::grpc++ INTERFACE mindspore::ssl mindspore::crypto)
# link system openssl
find_package(OpenSSL REQUIRED)
target_link_libraries(grpc::grpc++ INTERFACE OpenSSL::SSL OpenSSL::Crypto)
function(ms_grpc_generate c_var h_var)
@ -108,8 +106,7 @@ function(ms_grpc_generate c_var h_var)
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/proto"
COMMAND protobuf::protoc --version
COMMAND protobuf::protoc -I${file_dir} --cpp_out=${CMAKE_BINARY_DIR}/proto
--grpc_out=${CMAKE_BINARY_DIR}/proto
--plugin=protoc-gen-grpc=$<TARGET_FILE:grpc::grpc_cpp_plugin> ${abs_file}
--grpc_out=${CMAKE_BINARY_DIR}/proto --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc::grpc_cpp_plugin> ${abs_file}
DEPENDS protobuf::protoc grpc::grpc_cpp_plugin ${abs_file}
COMMENT "Running C++ gRPC compiler on ${file}" VERBATIM)
endforeach()
@ -117,4 +114,5 @@ function(ms_grpc_generate c_var h_var)
set_source_files_properties(${${c_var}} ${${h_var}} PROPERTIES GENERATED TRUE)
set(${c_var} ${${c_var}} PARENT_SCOPE)
set(${h_var} ${${h_var}} PARENT_SCOPE)
endfunction()

@ -11,7 +11,7 @@ if(BUILD_LITE)
-DANDROID_NDK=$ENV{ANDROID_NDK}
-DANDROID_ABI=arm64-v8a
-DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang
-DANDROID_STL=${ANDROID_STL}
-DANDROID_STL=c++_shared -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
${CMAKE_OPTION})
endif()
if(PLATFORM_ARM32)
@ -20,39 +20,28 @@ if(BUILD_LITE)
-DANDROID_NDK=$ENV{ANDROID_NDK}
-DANDROID_ABI=armeabi-v7a
-DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang
-DANDROID_STL=${ANDROID_STL}
-DANDROID_STL=c++_shared -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
${CMAKE_OPTION})
endif()
else()
if(NOT ENABLE_GLIBCXX)
set(gtest_CXXFLAGS "${gtest_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()
set(gtest_CXXFLAGS "${gtest_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()
if(ENABLE_GITEE)
set(REQ_URL "https://gitee.com/mirrors/googletest/repository/archive/release-1.8.1.tar.gz")
set(MD5 "0ec077324f27c2685635ad4cc9bdc263")
set(REQ_URL "https://gitee.com/mirrors/googletest/repository/archive/release-1.8.0.tar.gz")
set(MD5 "89e13ca1aa48d370719d58010b83f62c")
else()
set(REQ_URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz")
set(MD5 "2e6fbeb6a91310a16efe181886c59596")
set(REQ_URL "https://github.com/google/googletest/archive/release-1.8.0.tar.gz")
set(MD5 "16877098823401d1bf2ed7891d7dce36")
endif()
mindspore_add_pkg(gtest
VER 1.8.1
VER 1.8.0
LIBS gtest
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION ${CMAKE_OPTION})
include_directories(${gtest_INC})
add_library(mindspore::gtest ALIAS gtest::gtest)
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
file(COPY ${gtest_DIRPATH}/bin/libgtest${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION
${CMAKE_BINARY_DIR}/googletest/googlemock/gtest)
file(COPY ${gtest_DIRPATH}/bin/libgtest_main${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION
${CMAKE_BINARY_DIR}/googletest/googlemock/gtest)
else()
file(COPY ${gtest_LIBPATH}/libgtest${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION
${CMAKE_BINARY_DIR}/googletest/googlemock/gtest)
file(COPY ${gtest_LIBPATH}/libgtest_main${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION
${CMAKE_BINARY_DIR}/googletest/googlemock/gtest)
endif()
file(COPY ${gtest_LIBPATH}/libgtest${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR}/googletest/googlemock/gtest)
file(COPY ${gtest_LIBPATH}/libgtest_main${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR}/googletest/googlemock/gtest)

@ -28,9 +28,7 @@ else()
URL ${REQ_URL}
MD5 ${MD5}
PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/icu4c/icu4c.patch01
CONFIGURE_COMMAND ./icu4c/source/runConfigureICU MacOSX --enable-rpath --disable-tests
--disable-samples --disable-icuio --disable-extras
ICU_DATA_FILTER_FILE=${CMAKE_BINARY_DIR}/icu4c_filter.json
CONFIGURE_COMMAND ./icu4c/source/runConfigureICU MacOSX --enable-rpath --disable-tests --disable-samples --disable-icuio --disable-extras ICU_DATA_FILTER_FILE=${CMAKE_BINARY_DIR}/icu4c_filter.json
)
else()
mindspore_add_pkg(icu4c
@ -39,9 +37,7 @@ else()
URL ${REQ_URL}
MD5 ${MD5}
PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/icu4c/icu4c.patch01
CONFIGURE_COMMAND ./icu4c/source/runConfigureICU Linux --enable-rpath --disable-tests --disable-samples
--disable-icuio --disable-extras
ICU_DATA_FILTER_FILE=${CMAKE_BINARY_DIR}/icu4c_filter.json
CONFIGURE_COMMAND ./icu4c/source/runConfigureICU Linux --enable-rpath --disable-tests --disable-samples --disable-icuio --disable-extras ICU_DATA_FILTER_FILE=${CMAKE_BINARY_DIR}/icu4c_filter.json
)
endif()
include_directories(${icu4c_INC})

@ -8,11 +8,9 @@ else()
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(jpeg_turbo_CFLAGS "-fstack-protector-all -Wno-uninitialized -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2 \
-O2")
set(jpeg_turbo_CFLAGS "-fstack-protector-all -Wno-uninitialized -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2 -O2")
else()
set(jpeg_turbo_CFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -fPIC \
-D_FORTIFY_SOURCE=2 -O2")
set(jpeg_turbo_CFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2 -O2")
endif()
set(jpeg_turbo_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack,-s")

@ -7,23 +7,19 @@ if(ENABLE_GITEE)
set(REQ_URL "https://gitee.com/mirrors/libevent/repository/archive/release-2.1.12-stable.tar.gz")
set(MD5 "c9036513dd9e5b4fa1c81ade23b7ead2")
else()
set(REQ_URL
"https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz")
set(REQ_URL "https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz")
set(MD5 "b5333f021f880fe76490d8a799cd79f4")
endif()
message("libevent using openssl stub dir: " ${openssl_ROOT})
mindspore_add_pkg(libevent
VER 2.1.12
LIBS event event_pthreads event_core event_openssl
LIBS event event_pthreads event_core
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_TESTING=OFF -DOPENSSL_ROOT_DIR:PATH=${openssl_ROOT})
CMAKE_OPTION -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_TESTING=OFF)
include_directories(${libevent_INC})
add_library(mindspore::event ALIAS libevent::event)
add_library(mindspore::event_pthreads ALIAS libevent::event_pthreads)
add_library(mindspore::event_core ALIAS libevent::event_core)
add_library(mindspore::event_openssl ALIAS libevent::event_openssl)

@ -16,11 +16,11 @@ endif()
set(tiff_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
if(ENABLE_GITEE)
set(REQ_URL "https://gitee.com/mirrors/libtiff/repository/archive/v4.2.0.tar.gz")
set(MD5 "38b7bdd622c554b98967ccf2013b6478")
set(REQ_URL "https://gitee.com/mirrors/libtiff/repository/archive/v4.1.0.tar.gz")
set(MD5 "76b951159c8bdf47dba4803659c232d1")
else()
set(REQ_URL "http://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz")
set(MD5 "2bbf6db1ddc4a59c89d6986b368fc063")
set(REQ_URL "https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.tar.gz")
set(MD5 "21de8d35c1b21ac82663fa9f56d3350d")
endif()
mindspore_add_pkg(tiff

@ -22,11 +22,11 @@ function(gene_opencl BASEPATH)
if(NOT EXISTS ${CL_SRC_DIR})
return()
endif()
file(GLOB_RECURSE CL_LIST ${CL_SRC_DIR}/*.cl ${CL_SRC_DIR}/int8/*.cl)
file(GLOB_RECURSE CL_LIST ${CL_SRC_DIR}/*.cl)
foreach(file_path ${CL_LIST})
file(REMOVE ${file_path}.inc)
string(REGEX REPLACE ".+/(.+)\\..*" "\\1" kernel_name "${file_path}")
set(inc_file_ex "${file_path}.inc")
set(inc_file_ex "${kernel_name}.cl.inc")
execute_process(
COMMAND bash -c "sed 's/\\\\/\\\\\\\\/g' "
COMMAND bash -c "sed 's/\\\"/\\\\\\\"/g' "
@ -39,8 +39,7 @@ function(gene_opencl BASEPATH)
if(NOT RESULT EQUAL "0")
message(FATAL_ERROR "error! when generate ${inc_file_ex}")
endif()
__exec_cmd(COMMAND sed -i "1i\\static const char *${kernel_name}_source =\\\"\\\\n\\\" \\\\"
${inc_file_ex} WORKING_DIRECTORY ${CL_SRC_DIR})
__exec_cmd(COMMAND sed -i "1i\\static const char *${kernel_name}_source =\\\"\\\\n\\\" \\\\" ${inc_file_ex} WORKING_DIRECTORY ${CL_SRC_DIR})
__exec_cmd(COMMAND sed -i "$a\\\\\;" ${inc_file_ex} WORKING_DIRECTORY ${CL_SRC_DIR})
endforeach()
endfunction()

@ -8,159 +8,74 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -Wno-attributes -Wno-unknown-pragmas")
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -Wno-unused-value -Wno-implicit-fallthrough")
else()
set(opencv_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2")
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -O2")
if(NOT ENABLE_GLIBCXX)
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()
set(opencv_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
set(opencv_CFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2 -O2")
set(opencv_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
endif()
if(ENABLE_GITEE)
if(PYTHON_VERSION MATCHES "3.9")
set(REQ_URL "https://gitee.com/mirrors/opencv/repository/archive/4.5.1.tar.gz")
set(MD5 "e74309207f2fa88fb6cc417d8ea9ff09")
elseif((PYTHON_VERSION MATCHES "3.7") OR (PYTHON_VERSION MATCHES "3.8"))
set(REQ_URL "https://gitee.com/mirrors/opencv/repository/archive/4.2.0.tar.gz")
set(MD5 "00424c7c4acde1e26ebf17aaa155bf23")
else()
message("Could not find 'Python 3.8' or 'Python 3.7' or 'Python 3.9'")
return()
endif()
set(REQ_URL "https://gitee.com/mirrors/opencv/repository/archive/4.2.0.tar.gz")
set(MD5 "00424c7c4acde1e26ebf17aaa155bf23")
else()
if(PYTHON_VERSION MATCHES "3.9")
set(REQ_URL "https://github.com/opencv/opencv/archive/4.5.1.tar.gz")
set(MD5 "2205d3169238ec1f184438a96de68513")
elseif((PYTHON_VERSION MATCHES "3.7") OR (PYTHON_VERSION MATCHES "3.8"))
set(REQ_URL "https://github.com/opencv/opencv/archive/4.2.0.tar.gz")
set(MD5 "e8cb208ce2723481408b604b480183b6")
else()
message("Could not find 'Python 3.8' or 'Python 3.7' or 'Python 3.9'")
return()
endif()
set(REQ_URL "https://github.com/opencv/opencv/archive/4.2.0.tar.gz")
set(MD5 "e8cb208ce2723481408b604b480183b6")
endif()
if(WIN32)
if(PYTHON_VERSION MATCHES "3.9")
mindspore_add_pkg(opencv
VER 4.5.1
LIBS libopencv_core451.dll.a libopencv_imgcodecs451.dll.a libopencv_imgproc451.dll.a
LIB_PATH x64/mingw/lib
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF
-DWITH_ADE=OFF
-DBUILD_ZLIB=ON
-DBUILD_JPEG=ON
-DBUILD_PNG=ON
-DBUILD_OPENEXR=ON
-DBUILD_TESTS=OFF
-DBUILD_PERF_TESTS=OFF
-DBUILD_opencv_apps=OFF
-DCMAKE_SKIP_RPATH=TRUE
-DBUILD_opencv_python3=OFF
-DBUILD_opencv_videoio=OFF
-DWITH_FFMPEG=OFF
-DWITH_TIFF=ON
-DBUILD_TIFF=OFF
-DWITH_JASPER=OFF
-DBUILD_JASPER=OFF
-DTIFF_INCLUDE_DIR=${tiff_INC}
-DTIFF_LIBRARY=${tiff_LIB})
elseif(PYTHON_VERSION MATCHES "3.8" OR PYTHON_VERSION MATCHES "3.7")
mindspore_add_pkg(opencv
VER 4.2.0
LIBS libopencv_core420.dll.a libopencv_imgcodecs420.dll.a libopencv_imgproc420.dll.a
LIB_PATH x64/mingw/lib
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF
-DWITH_ADE=OFF
-DBUILD_ZLIB=ON
-DBUILD_JPEG=ON
-DBUILD_PNG=ON
-DBUILD_OPENEXR=ON
-DBUILD_TESTS=OFF
-DBUILD_PERF_TESTS=OFF
-DBUILD_opencv_apps=OFF
-DCMAKE_SKIP_RPATH=TRUE
-DBUILD_opencv_python3=OFF
-DBUILD_opencv_videoio=OFF
-DWITH_FFMPEG=OFF
-DWITH_TIFF=ON
-DBUILD_TIFF=OFF
-DWITH_JASPER=OFF
-DBUILD_JASPER=OFF
-DWITH_LAPACK=OFF
-DTIFF_INCLUDE_DIR=${tiff_INC}
-DTIFF_LIBRARY=${tiff_LIB})
endif()
mindspore_add_pkg(opencv
VER 4.2.0
LIBS libopencv_core420.dll.a libopencv_imgcodecs420.dll.a libopencv_imgproc420.dll.a
LIB_PATH x64/mingw/lib
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF -DWITH_ADE=OFF
-DBUILD_ZLIB=ON
-DBUILD_JPEG=ON
-DBUILD_PNG=ON
-DBUILD_OPENEXR=ON
-DBUILD_TESTS=OFF
-DBUILD_PERF_TESTS=OFF
-DBUILD_opencv_apps=OFF
-DCMAKE_SKIP_RPATH=TRUE
-DBUILD_opencv_python3=OFF
-DBUILD_opencv_videoio=OFF
-DWITH_FFMPEG=OFF
-DWITH_TIFF=ON
-DBUILD_TIFF=OFF
-DWITH_JASPER=OFF
-DBUILD_JASPER=OFF
-DTIFF_INCLUDE_DIR=${tiff_INC}
-DTIFF_LIBRARY=${tiff_LIB})
else()
if(PYTHON_VERSION MATCHES "3.9")
mindspore_add_pkg(opencv
VER 4.5.1
LIBS opencv_core opencv_imgcodecs opencv_imgproc
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF
-DWITH_ADE=OFF
-DBUILD_ZLIB=ON
-DBUILD_JPEG=ON
-DBUILD_PNG=ON
-DBUILD_OPENEXR=ON
-DBUILD_TESTS=OFF
-DBUILD_PERF_TESTS=OFF
-DBUILD_opencv_apps=OFF
-DCMAKE_SKIP_RPATH=TRUE
-DBUILD_opencv_python3=OFF
-DWITH_FFMPEG=OFF
-DWITH_TIFF=ON
-DBUILD_TIFF=OFF
-DWITH_JASPER=OFF
-DBUILD_JASPER=OFF
-DTIFF_INCLUDE_DIR=${tiff_INC}
-DTIFF_LIBRARY=${tiff_LIB})
elseif(PYTHON_VERSION MATCHES "3.8" OR PYTHON_VERSION MATCHES "3.7")
mindspore_add_pkg(opencv
VER 4.2.0
LIBS opencv_core opencv_imgcodecs opencv_imgproc
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF
-DWITH_ADE=OFF
-DBUILD_ZLIB=ON
-DBUILD_JPEG=ON
-DBUILD_PNG=ON
-DBUILD_OPENEXR=ON
-DBUILD_TESTS=OFF
-DBUILD_PERF_TESTS=OFF
-DBUILD_opencv_apps=OFF
-DCMAKE_SKIP_RPATH=TRUE
-DBUILD_opencv_python3=OFF
-DWITH_FFMPEG=OFF
-DWITH_TIFF=ON
-DBUILD_TIFF=OFF
-DWITH_JASPER=OFF
-DBUILD_JASPER=OFF
-DWITH_LAPACK=OFF
-DTIFF_INCLUDE_DIR=${tiff_INC}
-DTIFF_LIBRARY=${tiff_LIB})
endif()
mindspore_add_pkg(opencv
VER 4.2.0
LIBS opencv_core opencv_imgcodecs opencv_imgproc
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF -DWITH_ADE=OFF
-DBUILD_ZLIB=ON
-DBUILD_JPEG=ON
-DBUILD_PNG=ON
-DBUILD_OPENEXR=ON
-DBUILD_TESTS=OFF
-DBUILD_PERF_TESTS=OFF
-DBUILD_opencv_apps=OFF
-DCMAKE_SKIP_RPATH=TRUE
-DBUILD_opencv_python3=OFF
-DWITH_FFMPEG=OFF
-DWITH_TIFF=ON
-DBUILD_TIFF=OFF
-DWITH_JASPER=OFF
-DBUILD_JASPER=OFF
-DTIFF_INCLUDE_DIR=${tiff_INC}
-DTIFF_LIBRARY=${tiff_LIB})
endif()
if(WIN32)
if(PYTHON_VERSION MATCHES "3.9")
include_directories(${opencv_INC})
add_library(mindspore::opencv_core ALIAS opencv::libopencv_core451.dll.a)
add_library(mindspore::opencv_imgcodecs ALIAS opencv::libopencv_imgcodecs451.dll.a)
add_library(mindspore::opencv_imgproc ALIAS opencv::libopencv_imgproc451.dll.a)
elseif(PYTHON_VERSION MATCHES "3.8" OR PYTHON_VERSION MATCHES "3.7")
include_directories(${opencv_INC})
add_library(mindspore::opencv_core ALIAS opencv::libopencv_core420.dll.a)
add_library(mindspore::opencv_imgcodecs ALIAS opencv::libopencv_imgcodecs420.dll.a)
add_library(mindspore::opencv_imgproc ALIAS opencv::libopencv_imgproc420.dll.a)
endif()
include_directories(${opencv_INC})
add_library(mindspore::opencv_core ALIAS opencv::libopencv_core420.dll.a)
add_library(mindspore::opencv_imgcodecs ALIAS opencv::libopencv_imgcodecs420.dll.a)
add_library(mindspore::opencv_imgproc ALIAS opencv::libopencv_imgproc420.dll.a)
else()
include_directories(${opencv_INC}/opencv4)
add_library(mindspore::opencv_core ALIAS opencv::opencv_core)

@ -1,18 +0,0 @@
if(ENABLE_GITEE)
set(REQ_URL "https://gitee.com/mirrors/openssl/repository/archive/OpenSSL_1_1_0l.tar.gz")
set(MD5 "9d18479e0cac8ff62f7e3df3cceb69dc")
else()
set(REQ_URL "https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_0l.tar.gz")
set(MD5 "46d9a2a92fd39198501503b40954e6f0")
endif()
mindspore_add_pkg(openssl
VER 1.1.0
LIBS ssl crypto
URL ${REQ_URL}
MD5 ${MD5}
PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/openssl-stub/openssl-stub.patch001
CONFIGURE_COMMAND ./config no-zlib)
include_directories(${openssl_INC})
add_library(mindspore::ssl ALIAS openssl::ssl)
add_library(mindspore::crypto ALIAS openssl::crypto)

@ -1,25 +0,0 @@
set(projectq_CXXFLAGS "-fopenmp -O2 -ffast-mast -mavx -DINTRIN")
set(projectq_CFLAGS "-fopenmp -O2 -ffast-mast -mavx -DINTRIN")
if(ENABLE_GITEE)
set(REQ_URL "https://gitee.com/mirrors/ProjectQ/repository/archive/v0.5.1.tar.gz")
set(MD5 "d874e93e56d3375f1c54c7dd1b731054")
else()
set(REQ_URL "https://github.com/ProjectQ-Framework/ProjectQ/archive/v0.5.1.tar.gz ")
set(MD5 "13430199c253284df8b3d840f11d3560")
endif()
if(ENABLE_CPU AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64")
message("Include projectq simulator")
mindspore_add_pkg(projectq
VER 0.5.1
HEAD_ONLY ./
URL ${REQ_URL}
MD5 ${MD5}
PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/projectq/projectq.patch001
)
include_directories(${projectq_INC})
else()
message("Quantum simulation only support x86_64 linux platform.")
endif()

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save