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

Refactor ASTTransformer.visit_For and fix a bug on grouped ndrange loops #648

Merged
merged 18 commits into from
Mar 25, 2020
Merged

Refactor ASTTransformer.visit_For and fix a bug on grouped ndrange loops #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8db682f
New extension 'adstack'
yuanming-hu Mar 23, 2020
59354a4
[skip ci] enforce format
yuanming-hu Mar 23, 2020
ae3d22d
New extension 'adstack' (#646)
yuanming-hu Mar 23, 2020
063542f
Simplify init in mgpcg_advanced.py (#645)
xumingkuan Mar 23, 2020
b077a71
put static/range/struct for into separate functions
xumingkuan Mar 23, 2020
1110512
make decorators look clearer
xumingkuan Mar 24, 2020
75c90f6
[skip ci] raise syntax error for more cases
xumingkuan Mar 24, 2020
d8a3dae
[skip ci] dynamic grouped ndrange?
xumingkuan Mar 24, 2020
2a07300
[skip ci] debug
xumingkuan Mar 24, 2020
774ef9a
fix
xumingkuan Mar 24, 2020
72c4e4b
add more tests
xumingkuan Mar 24, 2020
ee8face
Merge branch 'master' into for
xumingkuan Mar 24, 2020
02309ad
[skip ci] enforce code format
taichi-gardener Mar 24, 2020
569b7ed
further simplify mgpcg_advanced.py and make it able to run with self.…
xumingkuan Mar 24, 2020
d464c47
Merge branch 'for' of github.com:xumingkuan/taichi into for
xumingkuan Mar 24, 2020
306152b
[skip ci] enforce code format
taichi-gardener Mar 24, 2020
224663b
[skip ci] rename ijk to indices
xumingkuan Mar 24, 2020
25f3c7d
move components of visit_For outside
xumingkuan Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ SET(TI_VERSION_MINOR 5)
SET(TI_VERSION_PATCH 8)

execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND git rev-parse --short HEAD
RESULT_VARIABLE SHORT_HASH_RESULT
OUTPUT_VARIABLE TI_COMMIT_SHORT_HASH)
execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND git rev-parse HEAD
RESULT_VARIABLE SHORT_HASH_RESULT
OUTPUT_VARIABLE TI_COMMIT_HASH)
Expand Down Expand Up @@ -71,4 +71,3 @@ FILE(WRITE ${CMAKE_CURRENT_LIST_DIR}/taichi/common/version.h
"#define TI_CUDAVERSION \"${CUDA_VERSION}\"\n"
"#define TI_CUDAROOT_DIR \"${CUDA_TOOLKIT_ROOT_DIR}\"\n"
)

39 changes: 21 additions & 18 deletions examples/mgpcg_advanced.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,28 @@ def __init__(self):
self.pixels = ti.var(dt=real,
shape=(self.N_gui, self.N_gui)) # image buffer

self.grid = ti.root.pointer(ti.ijk, [self.N_tot // 4]).dense(
ti.ijk, 4).place(self.x, self.p, self.Ap)
indices = ti.ijk if self.dim == 3 else ti.ij
self.grid = ti.root.pointer(indices,
[self.N_tot // 4]).dense(indices, 4).place(
self.x, self.p, self.Ap)

for l in range(self.n_mg_levels):
self.grid = ti.root.pointer(ti.ijk,
self.grid = ti.root.pointer(indices,
[self.N_tot // (4 * 2**l)]).dense(
ti.ijk,
4).place(self.r[l], self.z[l])
indices, 4).place(
self.r[l], self.z[l])

ti.root.place(self.alpha, self.beta, self.sum)

@ti.kernel
def init(self):
for I in ti.grouped(ti.ndrange((self.N_ext, self.N_tot - self.N_ext),
(self.N_ext, self.N_tot - self.N_ext),
(self.N_ext, self.N_tot - self.N_ext))):
for I in ti.grouped(
ti.ndrange(*(
(self.N_ext, self.N_tot - self.N_ext), ) * self.dim)):
self.r[0][I] = 1.0
for i in ti.static(range(self.dim)):
self.r[0][I] *= ti.sin(2.0 * np.pi *
(i - self.N_ext) * 2.0 / self.N_tot)
self.r[0][I] *= ti.sin(2.0 * np.pi * (i - self.N_ext) * 2.0 /
self.N_tot)
self.z[0][I] = 0.0
self.Ap[I] = 0.0
self.p[I] = 0.0
Expand Down Expand Up @@ -98,7 +100,7 @@ def update_p(self):
@ti.kernel
def restrict(self, l: ti.template()):
for I in ti.grouped(self.r[l]):
res = self.r[l][I] - (6.0 * self.z[l][I] -
res = self.r[l][I] - (2.0 * self.dim * self.z[l][I] -
self.neighbor_sum(self.z[l], I))
self.r[l + 1][I // 2] += res * 0.5

Expand All @@ -112,8 +114,8 @@ def smooth(self, l: ti.template(), phase: ti.template()):
# phase = red/black Gauss-Seidel phase
for I in ti.grouped(self.r[l]):
if (I.sum()) & 1 == phase:
self.z[l][I] = (self.r[l][I] +
self.neighbor_sum(self.z[l], I)) / 6.0
self.z[l][I] = (self.r[l][I] + self.neighbor_sum(
self.z[l], I)) / (2.0 * self.dim)

def apply_preconditioner(self):
self.z[0].fill(0)
Expand All @@ -137,11 +139,12 @@ def apply_preconditioner(self):

@ti.kernel
def paint(self):
kk = self.N_tot * 3 // 8
for i, j in self.pixels:
ii = int(i * self.N / self.N_gui) + self.N_ext
jj = int(j * self.N / self.N_gui) + self.N_ext
self.pixels[i, j] = self.x[ii, jj, kk] / self.N_tot
if ti.static(self.dim == 3):
kk = self.N_tot * 3 // 8
for i, j in self.pixels:
ii = int(i * self.N / self.N_gui) + self.N_ext
jj = int(j * self.N / self.N_gui) + self.N_ext
self.pixels[i, j] = self.x[ii, jj, kk] / self.N_tot

def run(self):
gui = ti.GUI("Multigrid Preconditioned Conjugate Gradients",
Expand Down
Loading