Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Compatible changes for v1.1.0 rc #14

Merged
merged 2 commits into from Aug 10, 2022
Merged

Compatible changes for v1.1.0 rc #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
248b00b
Compatible changes for v1.1.0 rc
Aug 9, 2022
26231ad
add conditional import to ensure backward compatibility
ifsheldon Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/stannum/tube.py
View file
Open in desktop
Expand Up @@ -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_core 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
Expand Down
6 changes: 5 additions & 1 deletion src/stannum/utils.py
View file
Open in desktop
Expand Up @@ -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_core 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

Expand Down