Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TurTLE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TurTLE
TurTLE
Commits
b064c0e6
Commit
b064c0e6
authored
10 years ago
by
Chichi Lalescu
Browse files
Options
Downloads
Patches
Plain Diff
remove some debug messages
parent
30e37795
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/Morton_shuffler.cpp
+0
-12
0 additions, 12 deletions
src/Morton_shuffler.cpp
src/fftwf_tools.cpp
+0
-26
0 additions, 26 deletions
src/fftwf_tools.cpp
src/field_descriptor.cpp
+0
-9
0 additions, 9 deletions
src/field_descriptor.cpp
test.ipynb
+29
-33
29 additions, 33 deletions
test.ipynb
with
29 additions
and
80 deletions
src/Morton_shuffler.cpp
+
0
−
12
View file @
b064c0e6
...
...
@@ -31,12 +31,6 @@ Morton_shuffler::Morton_shuffler(
n
[
0
]
=
(
N0
/
8
)
*
(
N1
/
8
)
*
(
N2
/
8
);
n
[
1
]
=
8
*
8
*
8
*
this
->
d
;
this
->
dzcubbie
=
new
field_descriptor
(
2
,
n
,
MPI_REAL4
,
MPI_COMM_WORLD
);
char
bla
[
200
];
for
(
int
z
=
0
;
z
<
this
->
dzcubbie
->
sizes
[
0
];
z
++
)
{
sprintf
(
bla
,
"z = %d, zid = %d"
,
z
,
this
->
dzcubbie
->
rank
[
z
]);
proc_print_err_message
(
bla
);
}
//set up output file descriptor
int
out_rank
,
out_nprocs
;
...
...
@@ -71,7 +65,6 @@ int Morton_shuffler::shuffle(
ptrdiff_t
cubbie_size
=
8
*
8
*
8
*
this
->
d
;
ptrdiff_t
cc
;
float
*
rz
=
fftwf_alloc_real
(
cubbie_size
);
char
bla
[
200
];
for
(
int
k
=
0
;
k
<
this
->
drcubbie
->
sizes
[
0
];
k
++
)
{
rid
=
this
->
drcubbie
->
rank
[
k
];
...
...
@@ -81,11 +74,6 @@ int Morton_shuffler::shuffle(
{
z
=
regular_to_zindex
(
k
,
j
,
i
);
zid
=
this
->
dzcubbie
->
rank
[
z
];
sprintf
(
bla
,
"inside loops k = %d, j = %d, i = %d, z = %d, rid = %d, zid = %d"
,
k
,
j
,
i
,
z
,
rid
,
zid
);
proc_print_err_message
(
bla
);
zz
=
z
-
this
->
dzcubbie
->
starts
[
0
];
if
(
myrank
==
rid
||
myrank
==
zid
)
{
...
...
This diff is collapsed.
Click to expand it.
src/fftwf_tools.cpp
+
0
−
26
View file @
b064c0e6
...
...
@@ -33,25 +33,8 @@ int fftwf_copy_complex_array(
int64_t
oi0
,
oi1
;
int64_t
delta1
,
delta0
;
int
irank
,
orank
;
char
bla
[
100
];
delta0
=
(
fo
->
sizes
[
0
]
-
fi
->
sizes
[
0
]);
delta1
=
(
fo
->
sizes
[
1
]
-
fi
->
sizes
[
1
]);
//for (int64_t i = 0; i < fi->sizes[0]; i++)
//{
// sprintf(
// bla,
// "i = %d, irank = %d",
// i, fi->rank[i]);
// proc_print_err_message(bla);
//}
//for (int64_t i = 0; i < fo->sizes[0]; i++)
//{
// sprintf(
// bla,
// "i = %d, orank = %d",
// i, fo->rank[i]);
// proc_print_err_message(bla);
//}
for
(
ii0
=
0
;
ii0
<
fi
->
sizes
[
0
];
ii0
++
)
{
if
(
ii0
<=
fi
->
sizes
[
0
]
/
2
)
...
...
@@ -68,11 +51,6 @@ int fftwf_copy_complex_array(
}
irank
=
fi
->
rank
[
ii0
];
orank
=
fo
->
rank
[
oi0
];
//sprintf(
// bla,
// "inside ii0 loop, ii0 = %ld, iid = %d, oid = %d",
// ii0, irank, orank);
//proc_print_err_message(bla);
if
((
irank
==
orank
)
&&
(
irank
==
fi
->
myrank
))
{
...
...
@@ -85,7 +63,6 @@ int fftwf_copy_complex_array(
{
if
(
fi
->
myrank
==
irank
)
{
// proc_print_err_message("sending");
MPI_Send
(
(
void
*
)(
ai
+
(
ii0
-
fi
->
starts
[
0
])
*
fi
->
slice_size
),
fi
->
slice_size
,
...
...
@@ -93,11 +70,9 @@ int fftwf_copy_complex_array(
orank
,
ii0
,
fi
->
comm
);
// proc_print_err_message("sent");
}
if
(
fi
->
myrank
==
orank
)
{
// proc_print_err_message("receiving");
MPI_Recv
(
(
void
*
)(
buffer
),
fi
->
slice_size
,
...
...
@@ -106,7 +81,6 @@ int fftwf_copy_complex_array(
ii0
,
fi
->
comm
,
MPI_STATUS_IGNORE
);
// proc_print_err_message("received");
}
}
if
(
fi
->
myrank
==
orank
)
...
...
This diff is collapsed.
Click to expand it.
src/field_descriptor.cpp
+
0
−
9
View file @
b064c0e6
...
...
@@ -66,15 +66,6 @@ field_descriptor::field_descriptor(
MPI_INT
,
MPI_SUM
,
this
->
comm
);
char
bla
[
200
];
for
(
int
i
=
0
;
i
<
this
->
sizes
[
0
];
i
++
)
{
sprintf
(
bla
,
"i = %d, irank = %d"
,
i
,
this
->
rank
[
i
]);
proc_print_err_message
(
bla
);
}
delete
[]
local_rank
;
}
...
...
This diff is collapsed.
Click to expand it.
test.ipynb
+
29
−
33
View file @
b064c0e6
{
"metadata": {
"name": "",
"signature": "sha256:
69740a4c678f49d132215631329a0db6b8e997cbd8727af1a2295fa164cead
c6"
"signature": "sha256:
1d0a051b7a772fcdd3f288b1b5d2f37e02c0c140d9ab1b36201ae3c794b623
c6"
},
"nbformat": 3,
"nbformat_minor": 0,
...
...
@@ -52,7 +52,7 @@
" a[ii] = 0\n",
" return a\n",
"\n",
"n =
32
\n",
"n =
40
\n",
"N = 128\n",
"\n",
"Kdata0 = generate_data_3D(n, p = 2).astype(np.complex64)\n",
...
...
@@ -63,16 +63,8 @@
],
"language": "python",
"metadata": {},
"outputs": [
{
"output_type": "stream",
"stream": "stderr",
"text": [
"-c:15: RuntimeWarning: divide by zero encountered in divide\n"
]
}
],
"prompt_number": 2
"outputs": [],
"prompt_number": 37
},
{
"cell_type": "code",
...
...
@@ -147,19 +139,19 @@
"\n",
"Rdata_py, zlist, plist = array_to_8cubes(Rdata_py_tmp)\n",
"\n",
"i0 = np.random.randint(16)\n",
"i1 = np.random.randint(16)\n",
"i2 = np.random.randint(16)\n",
"z = cm.grid3D_to_zindex(np.array([i0, i1, i2]))\n",
"mlab.contour3d(Rdata_py[z, :, :, :, 0], color = (1, 0, 0))\n",
"mlab.contour3d(Rdata_py_tmp[i0*8:i0*8 + 8, i1*8:i1*8+8, i2*8:i2*8+8, 0],\n",
" color = (0, 0, 1))\n",
"mlab.show()"
"
#
i0 = np.random.randint(16)\n",
"
#
i1 = np.random.randint(16)\n",
"
#
i2 = np.random.randint(16)\n",
"
#
z = cm.grid3D_to_zindex(np.array([i0, i1, i2]))\n",
"
#
mlab.contour3d(Rdata_py[z, :, :, :, 0], color = (1, 0, 0))\n",
"
#
mlab.contour3d(Rdata_py_tmp[i0*8:i0*8 + 8, i1*8:i1*8+8, i2*8:i2*8+8, 0],\n",
"
#
color = (0, 0, 1))\n",
"
#
mlab.show()"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 3
"prompt_number": 3
8
},
{
"cell_type": "code",
...
...
@@ -195,7 +187,7 @@
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 4
"prompt_number": 4
1
},
{
"cell_type": "code",
...
...
@@ -213,7 +205,8 @@
" s = np.max(np.abs(Rdata_py[None, z, :, :, :, 0] - Rdata[..., 0]),\n",
" axis = (1, 2, 3))\n",
" z1 = np.argmin(s)\n",
" print z, z1, s[z1]"
" print z, z1, s[z1]\n",
" #print Rdata[z1]"
],
"language": "python",
"metadata": {},
...
...
@@ -222,33 +215,36 @@
"output_type": "stream",
"stream": "stdout",
"text": [
"
2.86102
e-06\n"
"
3.33786
e-06\n"
]
}
],
"prompt_number":
5
"prompt_number":
40
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"i0 = np.random.randint(16)\n",
"i1 = np.random.randint(16)\n",
"i2 = np.random.randint(16)\n",
"# i0 = np.random.randint(16)\n",
"# i1 = np.random.randint(16)\n",
"# i2 = np.random.randint(16)\n",
"i0 = 8\n",
"i1 = 11\n",
"i2 = 2\n",
"z = cm.grid3D_to_zindex(np.array([i0, i1, i2]))\n",
"mlab.contour3d(Rdata_py[z, :, :, :, 0],\n",
" color = (0, 1, 0))\n",
"mlab.contour3d(Rdata_py_tmp[i0*8:i0*8 + 8,\n",
" i1*8:i1*8 + 8,\n",
" i2*8:i2*8 + 8, 0],\n",
" color = (0, 0, 1))\n",
"
#
mlab.contour3d(Rdata_py_tmp[i0*8:i0*8 + 8,\n",
"
#
i1*8:i1*8 + 8,\n",
"
#
i2*8:i2*8 + 8, 0],\n",
"
#
color = (0, 0, 1))\n",
"mlab.contour3d(Rdata[z, :, :, :, 0], color = (1, 0, 0))\n",
"mlab.show()"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number":
7
"prompt_number":
35
},
{
"cell_type": "code",
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment