From 248b00b0a0889c9c91de5e46cbb5ba480f93d0d2 Mon Sep 17 00:00:00 2001 From: Ailing Zhang Date: Tue, 9 Aug 2022 22:31:31 +0800 Subject: [PATCH 1/2] Compatible changes for v1.1.0 rc We're in the process of getting v1.1.0 release rc wheel and noticed this PR is required for stannum to work v1.1.0. --- src/stannum/tube.py | 2 +- src/stannum/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stannum/tube.py b/src/stannum/tube.py index 905d796..387684b 100644 --- a/src/stannum/tube.py +++ b/src/stannum/tube.py @@ -3,7 +3,7 @@ from taichi.lang.impl import axes from typing import Optional, Callable, Union, Tuple, List, Iterable, Dict, Any from .utils import to_taichi_type, need_auto_clearing_fields -from taichi._lib.core.taichi_core import DataType as TiDataType +from taichi._lib.core.taichi_python import DataType as TiDataType from taichi.lang.field import ScalarField from taichi.lang.matrix import MatrixField from functools import partial diff --git a/src/stannum/utils.py b/src/stannum/utils.py index d10be02..b2a4037 100644 --- a/src/stannum/utils.py +++ b/src/stannum/utils.py @@ -5,7 +5,7 @@ from taichi.lang.kernel_impl import Kernel from taichi.lang.matrix import MatrixField from taichi.lang.field import ScalarField -from taichi._lib.core.taichi_core import DataType as TiDataType +from taichi._lib.core.taichi_python import DataType as TiDataType import torch import taichi as ti From 26231ad1f96a783cac7339c656c6a424afb85600 Mon Sep 17 00:00:00 2001 From: Feng Liang Date: Tue, 9 Aug 2022 23:24:58 +0800 Subject: [PATCH 2/2] add conditional import to ensure backward compatibility --- src/stannum/tube.py | 3 +-- src/stannum/utils.py | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/stannum/tube.py b/src/stannum/tube.py index 387684b..3402e91 100644 --- a/src/stannum/tube.py +++ b/src/stannum/tube.py @@ -2,8 +2,7 @@ import torch from taichi.lang.impl import axes from typing import Optional, Callable, Union, Tuple, List, Iterable, Dict, Any -from .utils import to_taichi_type, need_auto_clearing_fields -from taichi._lib.core.taichi_python import DataType as TiDataType +from .utils import to_taichi_type, need_auto_clearing_fields, TiDataType from taichi.lang.field import ScalarField from taichi.lang.matrix import MatrixField from functools import partial diff --git a/src/stannum/utils.py b/src/stannum/utils.py index b2a4037..adba30a 100644 --- a/src/stannum/utils.py +++ b/src/stannum/utils.py @@ -5,7 +5,11 @@ from taichi.lang.kernel_impl import Kernel from taichi.lang.matrix import MatrixField from taichi.lang.field import ScalarField -from taichi._lib.core.taichi_python import DataType as TiDataType + +if __ti_version >= (1, 1, 0): + from taichi._lib.core.taichi_python import DataType as TiDataType +else: + from taichi._lib.core.taichi_core import DataType as TiDataType import torch import taichi as ti