lzhengning
/
JittorMirror
mirror of https://github.com/Jittor/Jittor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

This commit is contained in:
cxjyxx_me 2021-01-14 11:08:44 +08:00
parent 8cd3dcb234 6adf313681
commit 31c2be576e
463 changed files with 791 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSE.txt
View File

@ -1,4 +1,4 @@
Copyright (c) 2020 Jittor. All Rights Reserved
Copyright (c) 2021 Jittor. All Rights Reserved
Apache License
Version 2.0, January 2004
@ -188,7 +188,7 @@ Copyright (c) 2020 Jittor. All Rights Reserved
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright (c) 2020 Jittor. All Rights Reserved.
Copyright (c) 2021 Jittor. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
extern/cuda/cub/ops/cub_arg_reduce_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cub/ops/cub_arg_reduce_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cub/ops/cub_argsort_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cub/ops/cub_argsort_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cub/ops/cub_test_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cub/ops/cub_test_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cub/ops/cub_where_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Xiangli Li <1905692338@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cub/ops/cub_where_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Xiangli Li <1905692338@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cublas/inc/cublas_warper.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cublas/ops/cublas_batched_matmul_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Meng-Hao Guo <guomenghao1997@gmail.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cublas/ops/cublas_batched_matmul_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Meng-Hao Guo <guomenghao1997@gmail.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cublas/ops/cublas_matmul_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cublas/ops/cublas_matmul_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cublas/ops/cublas_test_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cublas/ops/cublas_test_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cublas/src/cublas_warper.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/cudnn/inc/cudnn_warper.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cudnn/ops/cudnn_conv_backward_w_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>
// Guowei Yang <471184555@qq.com>

2
extern/cuda/cudnn/ops/cudnn_conv_backward_w_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>
// Guowei Yang <471184555@qq.com>

2
extern/cuda/cudnn/ops/cudnn_conv_backward_x_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>
// Guowei Yang <471184555@qq.com>

2
extern/cuda/cudnn/ops/cudnn_conv_backward_x_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>
// Guowei Yang <471184555@qq.com>

2
extern/cuda/cudnn/ops/cudnn_conv_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
//
// This file is subject to the terms and conditions defined in

2
extern/cuda/cudnn/ops/cudnn_conv_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cudnn/ops/cudnn_test_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cudnn/ops/cudnn_test_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/cudnn/src/cudnn_warper.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/curand/inc/curand_warper.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/curand/ops/curand_random_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/cuda/curand/ops/curand_random_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/curand/src/curand_warper.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/curand/src/helper_curand.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/nccl/inc/nccl_warper.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor.
// Copyright (c) 2021 Jittor.
// All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/nccl/ops/nccl_all_reduce_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/cuda/nccl/ops/nccl_all_reduce_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/cuda/nccl/ops/nccl_broadcast_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/cuda/nccl/ops/nccl_broadcast_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/cuda/nccl/ops/nccl_reduce_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/cuda/nccl/ops/nccl_reduce_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guoye Yang <498731903@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/cuda/nccl/ops/nccl_test_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor.
// Copyright (c) 2021 Jittor.
// All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>.

2
extern/cuda/nccl/src/nccl_warper.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor.
// Copyright (c) 2021 Jittor.
// All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>.

2
extern/mkl/ops/mkl_conv_backward_w_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Guoye Yang <498731903@qq.com>

2
extern/mkl/ops/mkl_conv_backward_w_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/mkl/ops/mkl_conv_backward_x_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Guoye Yang <498731903@qq.com>

2
extern/mkl/ops/mkl_conv_backward_x_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/mkl/ops/mkl_conv_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/mkl/ops/mkl_conv_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/mkl/ops/mkl_matmul_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guowei Yang <471184555@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/mkl/ops/mkl_matmul_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers:
// Guoye Yang <498731903@qq.com>
// Dun Liang <randonlang@gmail.com>.

2
extern/mkl/ops/mkl_test_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/mkl/ops/mkl_test_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
extern/mpi/inc/mpi_warper.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor.
// Copyright (c) 2021 Jittor.
// All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>.

2
extern/mpi/ops/mpi_all_reduce_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guowei Yang <471184555@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/mpi/ops/mpi_all_reduce_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guowei Yang <471184555@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/mpi/ops/mpi_broadcast_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guowei Yang <471184555@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/mpi/ops/mpi_broadcast_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guowei Yang <471184555@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/mpi/ops/mpi_reduce_op.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guowei Yang <471184555@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/mpi/ops/mpi_reduce_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Guowei Yang <471184555@qq.com>.
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.

2
extern/mpi/ops/mpi_test_op.h vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020
// Copyright (c) 2021
// Dun Liang <randonlang@gmail.com>.
// All Rights Reserved.
// This file is subject to the terms and conditions defined in

2
extern/mpi/src/mpi_warper.cc vendored
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor.
// Copyright (c) 2021 Jittor.
// All Rights Reserved.
// Maintainers:
// Dun Liang <randonlang@gmail.com>.

8
python/jittor/__init__.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Dun Liang <randonlang@gmail.com>.
# Meng-Hao Guo <guomenghao1997@gmail.com>
@ -8,7 +8,7 @@
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.
# ***************************************************************
__version__ = '1.2.2.12'
__version__ = '1.2.2.16'
from . import lock
with lock.lock_scope():
ori_int = int
@ -40,7 +40,9 @@ import traceback
def safepickle(obj, path):
s = pickle.dumps(obj, pickle.HIGHEST_PROTOCOL)
# Protocol version 4 was added in Python 3.4. It adds support for very large objects, pickling more kinds of objects, and some data format optimizations.
# ref: <https://docs.python.org/3/library/pickle.html>
s = pickle.dumps(obj, 4)
checksum = hashlib.sha1(s).digest()
s += bytes(checksum)
s += b"HCAJSLHD"

2
python/jittor/attention.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/compile_extern.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/compiler.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/contrib.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Guoye Yang <498731903@qq.com>

2
python/jittor/dataset/dataset.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Meng-Hao Guo <guomenghao1997@gmail.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/dataset/utils.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Meng-Hao Guo <guomenghao1997@gmail.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/depthwise_conv.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guoye Yang <498731903@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/init.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/init_cupy.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/linalg.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Haoyang Peng <2247838039@qq.com>
# Guowei Yang <471184555@qq.com>

2
python/jittor/lr_scheduler.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

158
python/jittor/misc.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Dun Liang <randonlang@gmail.com>.
# Wenyang Zhou <576825820@qq.com>
@ -838,4 +838,158 @@ def get_max_memory_treemap(build_by=0, do_print=True):
out = print_tree(tree, max_memory_size, '', '', build_by)
if (do_print):
print(out)
return tree, out
return tree, out
def python_pass_warper(mod_func, args, kw):
import importlib
mod, func = mod_func.rsplit(".", 1)
mod = importlib.import_module(mod)
func = getattr(mod, func)
args = args + ("**kw",)
args = ",".join(args)
return eval(f"func({args})")
def auto_parallel(n, src, **kw):
"""
auto parallel(CPU and GPU) n-d for loop function like below:
Before:
void inner_func(int n0, int i0, int n1, int i1) {
...
}
for (int i0=0; i0<n0; i0++)
for (int i1=0; i1<n1; i1++)
inner_func(n0, i0, n1, i1, ...);
After:
@python.jittor.auto_parallel(2)
void inner_func(int n0, int i0, int n1, int i1) {
...
}
inner_func(n0, 0, n1, 0, ...);
"""
# src = prev_func func_name(args)code
a, b = src.split('(', 1)
prev_func, func_name = a.rsplit(None, 1)
args, code = b.split(')', 1)
args = args.split(',')
assert len(args) >= n*2, (args, n)
oargs = args[n*2:]
pargs = args[:n*2]
piargs = pargs[1::2]
pnargs = pargs[0::2]
pnargs2 = [ a.split()[-1] for a in pnargs ]
oargs2 = [ a.split()[-1] for a in oargs ]
entry_func_args_def = ",".join(["int tn"+str(i) for i in range(n)]
+ pnargs + oargs)
entry_func_args = ",".join(["tn"+str(i) for i in range(n)]
+ pnargs2 + oargs2)
tid_def = ""
tid_loop = ""
call_args = []
for i in reversed(range(n)):
tid_def += f"\nauto tid{i} = tid & ((1<<tn{i})-1);"
tid_def += f"\nauto tnum{i} = 1<<tn{i};"
tid_def += f"\ntid = tid>>tn{i};"
for i in range(n):
tid_loop += f"\nfor (int i{i}=tid{i}; i{i}<{pnargs2[i]}; i{i}+=tn{i})"
call_args.append(pnargs2[i])
call_args.append(f"i{i}")
call_args += oargs2
call_args = ",".join(call_args)
xn = '\n'
new_src = f"""
#ifdef JIT_cuda
__device__
#endif
{src.replace(func_name, func_name+"_inner", 1)}
#ifdef JIT_cuda
__global__ static void {func_name}_entry({entry_func_args_def}) {{
int tid = threadIdx.x + blockIdx.x * blockDim.x;
{tid_def}
{tid_loop}
{func_name}_inner({call_args});
}}
#endif
inline static void {func_name}({",".join(pargs+oargs)}) {{
#ifdef JIT_cuda
int thread_num = 256*1024;
{xn.join([f"int tn{i} = NanoVector::get_nbits(std::min(thread_num, {pnargs2[i]})) - 2;thread_num >>= tn{i};" for i in reversed(range(n))])}
thread_num = 1<<({"+".join([f"tn{i}" for i in range(n)])});
int p1 = std::max(thread_num/1024, 1);
int p2 = std::min(thread_num, 1024);
{func_name}_entry<<<p1,p2>>>({entry_func_args});
#else
{xn.join([f"for (int i{i}=0; i{i}<{pnargs2[i]}; i{i}++)" for i in range(n)])}
{func_name}_inner({call_args});
#endif
}}
"""
return new_src
def searchsorted(sorted, values, right=False):
"""
Find the indices from the innermost dimension of `sorted` for each `values`.
Example::
sorted = jt.array([[1, 3, 5, 7, 9], [2, 4, 6, 8, 10]])
values = jt.array([[3, 6, 9], [3, 6, 9]])
ret = jt.searchsorted(sorted, values)
assert (ret == [[1, 3, 4], [1, 2, 4]]).all(), ret
ret = jt.searchsorted(sorted, values, right=True)
assert (ret == [[2, 3, 5], [1, 3, 4]]).all(), ret
sorted_1d = jt.array([1, 3, 5, 7, 9])
ret = jt.searchsorted(sorted_1d, values)
assert (ret == [[1, 3, 4], [1, 3, 4]]).all(), ret
"""
_searchsorted_header = f"""
namespace jittor {{
@python.jittor.auto_parallel(2)
inline static void searchsorted(
int batch_num, int batch_id, int value_num, int value_id,
int sorted_num, int batch_stride,
{sorted.dtype}* __restrict__ sort_p, {values.dtype}* __restrict__ value_p,
int32* __restrict__ index_p) {{
int32 l = batch_id * batch_stride;
int32 r = l + sorted_num;
auto v = value_p[batch_id * value_num + value_id];
while (l<r) {{
int32 m = (l+r)/2;
if (sort_p[m] {"<=" if right else "<"} v)
l = m+1;
else
r = m;
}}
index_p[batch_id * value_num + value_id] = l - batch_id * batch_stride;
}}
}}
"""
_searchsorted_src = """
int value_num = in1->shape[in1->shape.size()-1];
int sorted_num = in0->shape[in0->shape.size()-1];
int32 batch_num = in0->num / sorted_num;
int32 batch_num2 = in1->num / value_num;
int32 batch_stride = batch_num == 1 ? 0 : sorted_num;
CHECK(batch_num == batch_num2 || batch_num == 1);
searchsorted(batch_num2, 0, value_num, 0, sorted_num, batch_stride, in0_p, in1_p, out0_p);
"""
return jt.code(values.shape, "int32", [sorted, values],
cpu_header=_searchsorted_header,
cpu_src=_searchsorted_src,
cuda_header=_searchsorted_header,
cuda_src=_searchsorted_src)

2
python/jittor/models/alexnet.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Wenyang Zhou <576825820@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/models/densenet.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/models/googlenet.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Wenyang Zhou <576825820@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/models/mnasnet.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Wenyang Zhou <576825820@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/models/mobilenet.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Wenyang Zhou <576825820@qq.com>
# Dun Liang <randonlang@gmail.com>.

6
python/jittor/models/resnet.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Wenyang Zhou <576825820@qq.com>
@ -193,7 +193,9 @@ def Resnet101(pretrained=False, **kwargs):
y = model(x) # [10, 1000]
"""
return _resnet(Bottleneck, [3, 4, 23, 3], **kwargs)
model = _resnet(Bottleneck, [3, 4, 23, 3], **kwargs)
if pretrained: model.load("jittorhub://resnet101.pkl")
return model
resnet101 = Resnet101
def Resnet152(pretrained=False, **kwargs):

2
python/jittor/models/shufflenetv2.py
View File

@ -1,6 +1,6 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Wenyang Zhou <576825820@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/models/squeezenet.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Wenyang Zhou <576825820@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/models/vgg.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guoye Yang <498731903@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/nn.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Guoye Yang <498731903@qq.com>

2
python/jittor/optim.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Guoye Yang <498731903@qq.com>

2
python/jittor/pool.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Wenyang Zhou <576825820@qq.com>

2
python/jittor/pyjt_compiler.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/sparse.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Dun Liang <randonlang@gmail.com>.
# Xiangli Li <190569238@qq.com>

2
python/jittor/test/__main__.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/test/test.h
View File

@ -1,5 +1,5 @@
// ***************************************************************
// Copyright (c) 2020 Jittor. All Rights Reserved.
// Copyright (c) 2021 Jittor. All Rights Reserved.
// Maintainers: Dun Liang <randonlang@gmail.com>.
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/test/test_affine_grid.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/test/test_allocator.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/test/test_allocator2.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guoye Yang <498731903@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/test/test_arg_reduce_op.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guoye Yang <498731903@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/test/test_argsort_op.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guoye Yang <498731903@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/test/test_array.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/test/test_asm_tuner.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/test/test_atomic_tuner.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/test/test_attention.py
View File

@ -1,6 +1,6 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Guowei Yang <471184555@qq.com>
# Dun Liang <randonlang@gmail.com>.

2
python/jittor/test/test_auto_diff.py
View File

@ -1,5 +1,5 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers: Dun Liang <randonlang@gmail.com>.
# This file is subject to the terms and conditions defined in
# file 'LICENSE.txt', which is part of this source code package.

2
python/jittor/test/test_batchnorm.py
View File

@ -1,6 +1,6 @@
# ***************************************************************
# Copyright (c) 2020 Jittor. All Rights Reserved.
# Copyright (c) 2021 Jittor. All Rights Reserved.
# Maintainers:
# Wenyang Zhou <576825820@qq.com>
# Dun Liang <randonlang@gmail.com>.

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