Skip to content

Commit 1099993

Browse files
Merge pull request #92 from clEsperanto/change_push
Change push
2 parents a1a864c + 7cc0172 commit 1099993

File tree

178 files changed

+1103
-2082
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+1103
-2082
lines changed

demo/basics/browse_operations.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
"name": "python",
469469
"nbconvert_exporter": "python",
470470
"pygments_lexer": "ipython3",
471-
"version": "3.8.3"
471+
"version": "3.8.6"
472472
}
473473
},
474474
"nbformat": 4,

demo/basics/count_blobs.ipynb

Lines changed: 33 additions & 66 deletions
Large diffs are not rendered by default.

demo/basics/crop_and_paste_images.ipynb

Lines changed: 24 additions & 110 deletions
Large diffs are not rendered by default.

demo/basics/multiply_matrices.ipynb

Lines changed: 15 additions & 59 deletions
Large diffs are not rendered by default.

demo/basics/multiply_vectors_and_matrices.ipynb

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"voxel_size = np.asarray([[0.2], [0.2], [0.5]])\n",
4848
"print(\"Array shape:\" + str(voxel_size.shape))\n",
4949
"\n",
50-
"gpu_voxel_size = cle.push_zyx(voxel_size)\n",
51-
"print(\"GPU array shape:\" + str(voxel_size.shape))\n"
50+
"gpu_voxel_size = cle.push(voxel_size)\n",
51+
"print(\"GPU array shape:\" + str(voxel_size.shape))"
5252
]
5353
},
5454
{
@@ -75,7 +75,7 @@
7575
")\n",
7676
"print(\"Array shape:\" + str(pointlist.shape))\n",
7777
"\n",
78-
"gpu_pointlist = cle.push_zyx(pointlist)\n",
78+
"gpu_pointlist = cle.push(pointlist)\n",
7979
"print(\"GPU array shape:\" + str(gpu_pointlist.shape))"
8080
]
8181
},
@@ -137,14 +137,6 @@
137137
" [0. 1.2 0.2 0.4]\n",
138138
" [4.5 5.5 3. 1. ]]\n"
139139
]
140-
},
141-
{
142-
"name": "stderr",
143-
"output_type": "stream",
144-
"text": [
145-
"c:\\users\\rober\\miniconda3\\lib\\site-packages\\pyopencl\\__init__.py:252: CompilerWarning: Non-empty compiler output encountered. Set the environment variable PYOPENCL_COMPILER_OUTPUT=1 to see more.\n",
146-
" warn(\"Non-empty compiler output encountered. Set the \"\n"
147-
]
148140
}
149141
],
150142
"source": [
@@ -205,7 +197,7 @@
205197
"name": "python",
206198
"nbconvert_exporter": "python",
207199
"pygments_lexer": "ipython3",
208-
"version": "3.8.3"
200+
"version": "3.8.6"
209201
}
210202
},
211203
"nbformat": 4,

demo/basics/spots_pointlists_matrices_tables.ipynb

Lines changed: 25 additions & 75 deletions
Large diffs are not rendered by default.

demo/basics/voronoi_diagrams.ipynb

Lines changed: 20 additions & 86 deletions
Large diffs are not rendered by default.

demo/napari_gui/napari_.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
viewer.add_image(image, name='blobs')
1212

1313
# push image to GPU
14-
input = cle.push_zyx(image)
14+
input = cle.push(image)
1515

1616
# process the image
1717
sigma = 1
@@ -20,7 +20,7 @@
2020
labels = cle.connected_components_labeling_box(binary)
2121

2222
# pull result back
23-
output = cle.pull_zyx(labels)
23+
output = cle.pull(labels)
2424

2525
# add it to napari
2626
viewer.add_labels(output)

demo/napari_gui/napari_magicgui.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
def process_image(input: Image, sigma: float = 5) -> Labels:
1010
if input:
1111
# push image to GPU
12-
input = cle.push_zyx(input.data)
12+
input = cle.push(input.data)
1313

1414
# process the image
1515
blurred = cle.gaussian_blur(input, sigma_x=sigma, sigma_y=sigma)
1616
binary = cle.threshold_otsu(blurred)
1717
labels = cle.connected_components_labeling_box(binary)
1818

1919
# pull result back
20-
output = cle.pull_zyx(labels)
20+
output = cle.pull(labels)
2121
return output
2222

2323
# load data

demo/neighbors/mesh_between_centroids.ipynb

Lines changed: 25 additions & 71 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)