wip overall small changes to figures

This commit is contained in:
Jan Kowalczyk
2025-09-28 14:35:10 +02:00
parent f36477ed9b
commit e34a374adc
21 changed files with 148 additions and 265 deletions

Binary file not shown.

View File

@@ -30,7 +30,8 @@ arch = [
height=H8 * 1.6,
depth=D1,
width=W1,
caption=f"Latent Space",
caption="Latent Space",
captionshift=0,
),
# to_connection("fc1", "latent"),
# --------------------------- DECODER ---------------------------
@@ -39,19 +40,20 @@ arch = [
"fc3",
n_filer="{{8×128×8}}",
zlabeloffset=0.5,
offset="(2,0,0)",
offset="(2,-.5,0)",
to="(latent-east)",
height=H1,
depth=D512,
width=W1,
caption=f"FC",
captionshift=20,
),
to_Conv(
"unsqueeze",
s_filer="{{128×8}}",
zlabeloffset=0.4,
n_filer=32,
offset="(2,0,0)",
offset="(1.4,0,0)",
to="(fc3-east)",
height=H8,
depth=D128,
@@ -62,7 +64,7 @@ arch = [
# Reshape to 4×8×512
to_UnPool(
"up1",
offset="(2,0,0)",
offset="(1.2,0,0)",
n_filer=32,
to="(unsqueeze-east)",
height=H16,
@@ -101,7 +103,8 @@ arch = [
height=H16,
depth=D1024,
width=W32,
caption="",
caption="Deconv2",
captionshift=20,
),
to_Conv(
"dwdeconv3",
@@ -112,7 +115,7 @@ arch = [
height=H16,
depth=D1024,
width=W1,
caption="Deconv2",
caption="",
),
to_Conv(
"dwdeconv4",
@@ -134,7 +137,8 @@ arch = [
height=H32,
depth=D2048,
width=W16,
caption="",
caption="Deconv3",
captionshift=10,
),
to_Conv(
"dwdeconv5",
@@ -145,7 +149,7 @@ arch = [
height=H32,
depth=D2048,
width=W1,
caption="Deconv3",
caption="",
),
to_Conv(
"dwdeconv6",
@@ -164,7 +168,7 @@ arch = [
s_filer="{{2048×32}}",
zlabeloffset=0.15,
n_filer=1,
offset="(2,0,0)",
offset="(1.5,0,0)",
to="(dwdeconv6-east)",
height=H32,
depth=D2048,
@@ -178,12 +182,13 @@ arch = [
s_filer="{{2048×32}}",
zlabeloffset=0.15,
n_filer=1,
offset="(2,0,0)",
offset="(1.5,0,0)",
to="(outconv-east)",
height=H32,
depth=D2048,
width=W1,
caption="Output",
captionshift=5,
),
# to_connection("deconv2", "out"),
to_end(),

View File

@@ -28,6 +28,7 @@
{Box={
name=latent,
caption=Latent Space,
captionshift=0,
xlabel={{, }},
zlabeloffset=0.3,
zlabel=latent dim,
@@ -39,10 +40,11 @@
};
\pic[shift={(2,0,0)}] at (latent-east)
\pic[shift={(2,-.5,0)}] at (latent-east)
{Box={
name=fc3,
caption=FC,
captionshift=20,
xlabel={{" ","dummy"}},
zlabeloffset=0.5,
zlabel={{8×128×8}},
@@ -55,10 +57,11 @@
};
\pic[shift={(2,0,0)}] at (fc3-east)
\pic[shift={(1.4,0,0)}] at (fc3-east)
{Box={
name=unsqueeze,
caption=Unsqueeze,
captionshift=0,
xlabel={{32, }},
zlabeloffset=0.4,
zlabel={{128×8}},
@@ -70,10 +73,11 @@
};
\pic[shift={ (2,0,0) }] at (unsqueeze-east)
\pic[shift={ (1.2,0,0) }] at (unsqueeze-east)
{Box={
name=up1,
caption=,
captionshift=0,
fill=\UnpoolColor,
opacity=0.5,
xlabel={{32, }},
@@ -88,6 +92,7 @@
{Box={
name=dwdeconv1,
caption=Deconv1,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.3,
zlabel=,
@@ -103,6 +108,7 @@
{Box={
name=dwdeconv2,
caption=,
captionshift=0,
xlabel={{32, }},
zlabeloffset=0.4,
zlabel={{256×16}},
@@ -117,7 +123,8 @@
\pic[shift={ (2,0,0) }] at (dwdeconv2-east)
{Box={
name=up2,
caption=,
caption=Deconv2,
captionshift=20,
fill=\UnpoolColor,
opacity=0.5,
xlabel={{32, }},
@@ -131,7 +138,8 @@
\pic[shift={(0,0,0)}] at (up2-east)
{Box={
name=dwdeconv3,
caption=Deconv2,
caption=,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.3,
zlabel=,
@@ -147,6 +155,7 @@
{Box={
name=dwdeconv4,
caption=,
captionshift=0,
xlabel={{16, }},
zlabeloffset=0.17,
zlabel={{1024×16}},
@@ -161,7 +170,8 @@
\pic[shift={ (2,0,0) }] at (dwdeconv4-east)
{Box={
name=up3,
caption=,
caption=Deconv3,
captionshift=10,
fill=\UnpoolColor,
opacity=0.5,
xlabel={{16, }},
@@ -175,7 +185,8 @@
\pic[shift={(0,0,0)}] at (up3-east)
{Box={
name=dwdeconv5,
caption=Deconv3,
caption=,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.3,
zlabel=,
@@ -191,6 +202,7 @@
{Box={
name=dwdeconv6,
caption=,
captionshift=0,
xlabel={{8, }},
zlabeloffset=0.15,
zlabel={{2048×32}},
@@ -202,10 +214,11 @@
};
\pic[shift={(2,0,0)}] at (dwdeconv6-east)
\pic[shift={(1.5,0,0)}] at (dwdeconv6-east)
{Box={
name=outconv,
caption=Deconv4,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.15,
zlabel={{2048×32}},
@@ -217,10 +230,11 @@
};
\pic[shift={(2,0,0)}] at (outconv-east)
\pic[shift={(1.5,0,0)}] at (outconv-east)
{Box={
name=out,
caption=Output,
captionshift=5,
xlabel={{1, }},
zlabeloffset=0.15,
zlabel={{2048×32}},

Binary file not shown.

View File

@@ -125,7 +125,7 @@ arch = [
n_filer=8,
zlabeloffset=0.45,
s_filer="{{128×8}}",
offset="(2,0,0)",
offset="(1,0,0)",
to="(pool3-east)",
height=H8,
depth=D128,
@@ -137,12 +137,13 @@ arch = [
"fc1",
n_filer="{{8×128×8}}",
zlabeloffset=0.5,
offset="(2,0,0)",
offset="(2,-.5,0)",
to="(squeeze-east)",
height=H1,
depth=D512,
width=W1,
caption=f"FC",
caption="FC",
captionshift=0,
),
# to_connection("pool2", "fc1"),
# --------------------------- LATENT ---------------------------
@@ -150,7 +151,7 @@ arch = [
"latent",
n_filer="",
s_filer="latent dim",
offset="(2,0,0)",
offset="(1.3,0.5,0)",
to="(fc1-east)",
height=H8 * 1.6,
depth=D1,

View File

@@ -28,6 +28,7 @@
{Box={
name=input,
caption=Input,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.2,
zlabel={{2048×32}},
@@ -43,6 +44,7 @@
{Box={
name=dwconv1,
caption=,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.3,
zlabel=,
@@ -58,6 +60,7 @@
{Box={
name=dwconv2,
caption=Conv1,
captionshift=0,
xlabel={{16, }},
zlabeloffset=0.15,
zlabel={{2048×32}},
@@ -76,6 +79,7 @@
zlabeloffset=0.3,
zlabel={{512×32}},
caption=,
captionshift=0,
fill=\PoolColor,
opacity=0.5,
height=26,
@@ -89,6 +93,7 @@
{Box={
name=dwconv3,
caption=,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.3,
zlabel=,
@@ -104,6 +109,7 @@
{Box={
name=dwconv4,
caption=Conv2,
captionshift=0,
xlabel={{32, }},
zlabeloffset=0.3,
zlabel={{512×32}},
@@ -122,6 +128,7 @@
zlabeloffset=0.45,
zlabel={{256×16}},
caption=,
captionshift=0,
fill=\PoolColor,
opacity=0.5,
height=18,
@@ -138,6 +145,7 @@
zlabeloffset=0.45,
zlabel={{128×8}},
caption=,
captionshift=0,
fill=\PoolColor,
opacity=0.5,
height=12,
@@ -147,10 +155,11 @@
};
\pic[shift={(2,0,0)}] at (pool3-east)
\pic[shift={(1,0,0)}] at (pool3-east)
{Box={
name=squeeze,
caption=Squeeze,
captionshift=0,
xlabel={{8, }},
zlabeloffset=0.45,
zlabel={{128×8}},
@@ -162,10 +171,11 @@
};
\pic[shift={(2,0,0)}] at (squeeze-east)
\pic[shift={(2,-.5,0)}] at (squeeze-east)
{Box={
name=fc1,
caption=FC,
captionshift=0,
xlabel={{" ","dummy"}},
zlabeloffset=0.5,
zlabel={{8×128×8}},
@@ -178,10 +188,11 @@
};
\pic[shift={(2,0,0)}] at (fc1-east)
\pic[shift={(1.3,0.5,0)}] at (fc1-east)
{Box={
name=latent,
caption=Latent Space,
captionshift=0,
xlabel={{, }},
zlabeloffset=0.3,
zlabel=latent dim,

Binary file not shown.

View File

@@ -39,19 +39,20 @@ arch = [
"fc3",
n_filer="{{4×512×8}}",
zlabeloffset=0.35,
offset="(2,0,0)",
offset="(2,-.5,0)",
to="(latent-east)",
height=1.3,
depth=D512,
width=W1,
caption=f"FC",
captionshift=20,
),
# to_connection("latent", "fc3"),
# Reshape to 4×8×512
to_UnPool(
"up1",
n_filer=4,
offset="(2,0,0)",
offset="(2.5,0,0)",
to="(fc3-east)",
height=H16,
depth=D1024,
@@ -82,7 +83,8 @@ arch = [
height=H32,
depth=D2048,
width=W8,
caption="",
caption="Deconv2",
captionshift=10,
),
# to_connection("deconv1", "up2"),
# DeConv2 (5×5, same): 8->1, 32×2048
@@ -96,7 +98,7 @@ arch = [
height=H32,
depth=D2048,
width=W1,
caption="Deconv2",
caption="",
),
# to_connection("up2", "deconv2"),
# Output
@@ -111,6 +113,7 @@ arch = [
depth=D2048,
width=1.0,
caption="Output",
captionshift=5,
),
# to_connection("deconv2", "out"),
to_end(),

View File

@@ -28,6 +28,7 @@
{Box={
name=latent,
caption=Latent Space,
captionshift=0,
xlabel={{, }},
zlabeloffset=0.3,
zlabel=latent dim,
@@ -39,10 +40,11 @@
};
\pic[shift={(2,0,0)}] at (latent-east)
\pic[shift={(2,-.5,0)}] at (latent-east)
{Box={
name=fc3,
caption=FC,
captionshift=20,
xlabel={{" ","dummy"}},
zlabeloffset=0.35,
zlabel={{4×512×8}},
@@ -55,10 +57,11 @@
};
\pic[shift={ (2,0,0) }] at (fc3-east)
\pic[shift={ (2.5,0,0) }] at (fc3-east)
{Box={
name=up1,
caption=,
captionshift=0,
fill=\UnpoolColor,
opacity=0.5,
xlabel={{4, }},
@@ -73,6 +76,7 @@
{Box={
name=deconv1,
caption=Deconv1,
captionshift=0,
xlabel={{8, }},
zlabeloffset=0.2,
zlabel={{1024×16}},
@@ -87,7 +91,8 @@
\pic[shift={ (2,0,0) }] at (deconv1-east)
{Box={
name=up2,
caption=,
caption=Deconv2,
captionshift=10,
fill=\UnpoolColor,
opacity=0.5,
xlabel={{8, }},
@@ -101,7 +106,8 @@
\pic[shift={(0,0,0)}] at (up2-east)
{Box={
name=deconv2,
caption=Deconv2,
caption=,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.15,
zlabel={{2048×32}},
@@ -117,6 +123,7 @@
{Box={
name=out,
caption=Output,
captionshift=5,
xlabel={{1, }},
zlabeloffset=0.15,
zlabel={{2048×32}},

Binary file not shown.

View File

@@ -91,13 +91,14 @@ arch = [
to_fc(
"fc1",
n_filer="{{4×512×8}}",
offset="(2,0,0)",
offset="(2,-.5,0)",
zlabeloffset=0.5,
to="(pool2-east)",
height=1.3,
depth=D512,
width=W1,
caption=f"FC",
captionshift=20,
),
# to_connection("pool2", "fc1"),
# --------------------------- LATENT ---------------------------

View File

@@ -28,6 +28,7 @@
{Box={
name=input,
caption=Input,
captionshift=0,
xlabel={{1, }},
zlabeloffset=0.15,
zlabel={{2048×32}},
@@ -43,6 +44,7 @@
{Box={
name=conv1,
caption=Conv1,
captionshift=0,
xlabel={{8, }},
zlabeloffset=0.15,
zlabel={{2048×32}},
@@ -61,6 +63,7 @@
zlabeloffset=0.3,
zlabel={{1024×16}},
caption=,
captionshift=0,
fill=\PoolColor,
opacity=0.5,
height=18,
@@ -74,6 +77,7 @@
{Box={
name=conv2,
caption=Conv2,
captionshift=0,
xlabel={{4, }},
zlabeloffset=0.4,
zlabel={{1024×16\hspace{2.5em}512×8}},
@@ -92,6 +96,7 @@
zlabeloffset=0.3,
zlabel={{}},
caption=,
captionshift=0,
fill=\PoolColor,
opacity=0.5,
height=12,
@@ -101,10 +106,11 @@
};
\pic[shift={(2,0,0)}] at (pool2-east)
\pic[shift={(2,-.5,0)}] at (pool2-east)
{Box={
name=fc1,
caption=FC,
captionshift=20,
xlabel={{" ","dummy"}},
zlabeloffset=0.5,
zlabel={{4×512×8}},
@@ -121,6 +127,7 @@
{Box={
name=latent,
caption=Latent Space,
captionshift=0,
xlabel={{, }},
zlabeloffset=0.3,
zlabel=latent dim,