Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
4a49fd62
Commit
4a49fd62
authored
Aug 07, 2020
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed former constants
parent
c581440b
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
85 deletions
+41
-85
GPUTileProcessor.java
src/main/java/com/elphel/imagej/gpu/GPUTileProcessor.java
+25
-69
TwoQuadCLT.java
...main/java/com/elphel/imagej/tileprocessor/TwoQuadCLT.java
+16
-16
No files found.
src/main/java/com/elphel/imagej/gpu/GPUTileProcessor.java
View file @
4a49fd62
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/TwoQuadCLT.java
View file @
4a49fd62
...
@@ -2204,22 +2204,22 @@ public class TwoQuadCLT {
...
@@ -2204,22 +2204,22 @@ public class TwoQuadCLT {
System
.
out
.
println
(
" - textures: "
+(
runTexturesTime
*
1.0
e
-
6
)+
"ms"
);
System
.
out
.
println
(
" - textures: "
+(
runTexturesTime
*
1.0
e
-
6
)+
"ms"
);
System
.
out
.
println
(
" - RGBA: "
+(
runTexturesRBGATime
*
1.0
e
-
6
)+
"ms"
);
System
.
out
.
println
(
" - RGBA: "
+(
runTexturesRBGATime
*
1.0
e
-
6
)+
"ms"
);
// get data back from GPU
// get data back from GPU
float
[][][]
iclt_fimg
=
new
float
[
GPUTileProcessor
.
NUM_CAMS
][][];
float
[][][]
iclt_fimg
=
new
float
[
gpuQuad_main
.
getNumCams
()
][][];
for
(
int
ncam
=
0
;
ncam
<
iclt_fimg
.
length
;
ncam
++)
{
for
(
int
ncam
=
0
;
ncam
<
iclt_fimg
.
length
;
ncam
++)
{
iclt_fimg
[
ncam
]
=
gpuQuad_main
.
getRBG
(
ncam
);
iclt_fimg
[
ncam
]
=
gpuQuad_main
.
getRBG
(
ncam
);
}
}
// gpuQuad_main
int
out_width
=
GPUTileProcessor
.
IMG_WIDTH
+
GPUTileProcessor
.
DTT_SIZE
;
int
out_width
=
gpuQuad_main
.
getImageWidth
()
+
gpuQuad_main
.
getDttSize
()
;
int
out_height
=
GPUTileProcessor
.
IMG_HEIGHT
+
GPUTileProcessor
.
DTT_SIZE
;
int
out_height
=
gpuQuad_main
.
getImageHeight
()
+
gpuQuad_main
.
getDttSize
()
;
int
tilesX
=
GPUTileProcessor
.
IMG_WIDTH
/
GPUTileProcessor
.
DTT_SIZE
;
int
tilesX
=
gpuQuad_main
.
getImageWidth
()
/
gpuQuad_main
.
getDttSize
()
;
int
tilesY
=
GPUTileProcessor
.
IMG_HEIGHT
/
GPUTileProcessor
.
DTT_SIZE
;
int
tilesY
=
gpuQuad_main
.
getImageHeight
()
/
gpuQuad_main
.
getDttSize
()
;
// show extra
// show extra
/* */
/* */
String
[]
extra_group_titles
=
{
"DIFF"
,
"Red"
,
"Blue"
,
"Green"
};
String
[]
extra_group_titles
=
{
"DIFF"
,
"Red"
,
"Blue"
,
"Green"
};
String
[]
extra_titles
=
new
String
[
extra_group_titles
.
length
*
GPUTileProcessor
.
NUM_CAMS
];
String
[]
extra_titles
=
new
String
[
extra_group_titles
.
length
*
gpuQuad_main
.
getNumCams
()
];
for
(
int
g
=
0
;
g
<
extra_group_titles
.
length
;
g
++)
{
for
(
int
g
=
0
;
g
<
extra_group_titles
.
length
;
g
++)
{
for
(
int
ncam
=
0
;
ncam
<
GPUTileProcessor
.
NUM_CAMS
;
ncam
++)
{
for
(
int
ncam
=
0
;
ncam
<
gpuQuad_main
.
getNumCams
()
;
ncam
++)
{
extra_titles
[
g
*
GPUTileProcessor
.
NUM_CAMS
+
ncam
]=
extra_group_titles
[
g
]+
"-"
+
ncam
;
extra_titles
[
g
*
gpuQuad_main
.
getNumCams
()
+
ncam
]=
extra_group_titles
[
g
]+
"-"
+
ncam
;
}
}
}
}
float
[][]
extra
=
gpuQuad_main
.
getExtra
();
float
[][]
extra
=
gpuQuad_main
.
getExtra
();
...
@@ -2416,7 +2416,7 @@ public class TwoQuadCLT {
...
@@ -2416,7 +2416,7 @@ public class TwoQuadCLT {
texture_indices
.
length
,
texture_indices
.
length
,
(
is_mono
?
1
:
3
),
// int num_colors,
(
is_mono
?
1
:
3
),
// int num_colors,
clt_parameters
.
keep_weights
);
// boolean keep_weights);
clt_parameters
.
keep_weights
);
// boolean keep_weights);
int
texture_slice_size
=
(
2
*
GPUTileProcessor
.
DTT_SIZE
)*
(
2
*
GPUTileProcessor
.
DTT_SIZE
);
int
texture_slice_size
=
(
2
*
gpuQuad_main
.
getDttSize
())*
(
2
*
gpuQuad_main
.
getDttSize
()
);
int
texture_tile_size
=
texture_slice_size
*
num_src_slices
;
int
texture_tile_size
=
texture_slice_size
*
num_src_slices
;
if
(
debugLevel
>
-
1
)
{
if
(
debugLevel
>
-
1
)
{
...
@@ -2430,10 +2430,10 @@ public class TwoQuadCLT {
...
@@ -2430,10 +2430,10 @@ public class TwoQuadCLT {
for
(
int
slice
=
0
;
slice
<
num_src_slices
;
slice
++)
{
for
(
int
slice
=
0
;
slice
<
num_src_slices
;
slice
++)
{
System
.
out
.
println
(
"=== Slice="
+
slice
+
" ==="
);
System
.
out
.
println
(
"=== Slice="
+
slice
+
" ==="
);
for
(
int
i
=
0
;
i
<
2
*
GPUTileProcessor
.
DTT_SIZE
;
i
++)
{
for
(
int
i
=
0
;
i
<
2
*
gpuQuad_main
.
getDttSize
()
;
i
++)
{
for
(
int
j
=
0
;
j
<
2
*
GPUTileProcessor
.
DTT_SIZE
;
j
++)
{
for
(
int
j
=
0
;
j
<
2
*
gpuQuad_main
.
getDttSize
()
;
j
++)
{
System
.
out
.
print
(
String
.
format
(
"%10.4f "
,
System
.
out
.
print
(
String
.
format
(
"%10.4f "
,
flat_textures
[
indx
*
texture_tile_size
+
slice
*
texture_slice_size
+
2
*
GPUTileProcessor
.
DTT_SIZE
*
i
+
j
]));
flat_textures
[
indx
*
texture_tile_size
+
slice
*
texture_slice_size
+
2
*
gpuQuad_main
.
getDttSize
()
*
i
+
j
]));
}
}
System
.
out
.
println
();
System
.
out
.
println
();
}
}
...
@@ -2459,10 +2459,10 @@ public class TwoQuadCLT {
...
@@ -2459,10 +2459,10 @@ public class TwoQuadCLT {
for
(
int
slice
=
0
;
slice
<
texture_tile
.
length
;
slice
++)
{
for
(
int
slice
=
0
;
slice
<
texture_tile
.
length
;
slice
++)
{
System
.
out
.
println
(
"\n=== Slice="
+
slice
+
" ==="
);
System
.
out
.
println
(
"\n=== Slice="
+
slice
+
" ==="
);
for
(
int
i
=
0
;
i
<
2
*
GPUTileProcessor
.
DTT_SIZE
;
i
++)
{
for
(
int
i
=
0
;
i
<
2
*
gpuQuad_main
.
getDttSize
()
;
i
++)
{
for
(
int
j
=
0
;
j
<
2
*
GPUTileProcessor
.
DTT_SIZE
;
j
++)
{
for
(
int
j
=
0
;
j
<
2
*
gpuQuad_main
.
getDttSize
()
;
j
++)
{
System
.
out
.
print
(
String
.
format
(
"%10.4f "
,
System
.
out
.
print
(
String
.
format
(
"%10.4f "
,
texture_tile
[
slice
][
2
*
GPUTileProcessor
.
DTT_SIZE
*
i
+
j
]));
texture_tile
[
slice
][
2
*
gpuQuad_main
.
getDttSize
()
*
i
+
j
]));
}
}
System
.
out
.
println
();
System
.
out
.
println
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment