Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pseudo_image
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Léo Schneider
pseudo_image
Commits
24c47521
Commit
24c47521
authored
3 weeks ago
by
Schneider Leo
Browse files
Options
Downloads
Patches
Plain Diff
add weigthed sampler for training
parent
27124f64
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
image_ref/config.py
+1
-0
1 addition, 0 deletions
image_ref/config.py
image_ref/dataset_ref.py
+31
-9
31 additions, 9 deletions
image_ref/dataset_ref.py
image_ref/main.py
+1
-1
1 addition, 1 deletion
image_ref/main.py
with
33 additions
and
10 deletions
image_ref/config.py
+
1
−
0
View file @
24c47521
...
@@ -12,6 +12,7 @@ def load_args_contrastive():
...
@@ -12,6 +12,7 @@ def load_args_contrastive():
parser
.
add_argument
(
'
--batch_size
'
,
type
=
int
,
default
=
64
)
parser
.
add_argument
(
'
--batch_size
'
,
type
=
int
,
default
=
64
)
parser
.
add_argument
(
'
--positive_prop
'
,
type
=
int
,
default
=
30
)
parser
.
add_argument
(
'
--positive_prop
'
,
type
=
int
,
default
=
30
)
parser
.
add_argument
(
'
--model
'
,
type
=
str
,
default
=
'
ResNet18
'
)
parser
.
add_argument
(
'
--model
'
,
type
=
str
,
default
=
'
ResNet18
'
)
parser
.
add_argument
(
'
--sampler
'
,
type
=
str
,
default
=
None
)
parser
.
add_argument
(
'
--dataset_train_dir
'
,
type
=
str
,
default
=
'
data/processed_data/npy_image/data_training_contrastive
'
)
parser
.
add_argument
(
'
--dataset_train_dir
'
,
type
=
str
,
default
=
'
data/processed_data/npy_image/data_training_contrastive
'
)
parser
.
add_argument
(
'
--dataset_val_dir
'
,
type
=
str
,
default
=
'
data/processed_data/npy_image/data_test_contrastive
'
)
parser
.
add_argument
(
'
--dataset_val_dir
'
,
type
=
str
,
default
=
'
data/processed_data/npy_image/data_test_contrastive
'
)
parser
.
add_argument
(
'
--dataset_ref_dir
'
,
type
=
str
,
default
=
'
image_ref/img_ref
'
)
parser
.
add_argument
(
'
--dataset_ref_dir
'
,
type
=
str
,
default
=
'
image_ref/img_ref
'
)
...
...
This diff is collapsed.
Click to expand it.
image_ref/dataset_ref.py
+
31
−
9
View file @
24c47521
...
@@ -12,6 +12,8 @@ from typing import Callable, cast, Dict, List, Optional, Tuple, Union
...
@@ -12,6 +12,8 @@ from typing import Callable, cast, Dict, List, Optional, Tuple, Union
from
pathlib
import
Path
from
pathlib
import
Path
from
collections
import
OrderedDict
from
collections
import
OrderedDict
from
torch.utils.data
import
WeightedRandomSampler
IMG_EXTENSIONS
=
"
.npy
"
IMG_EXTENSIONS
=
"
.npy
"
class
Threshold_noise
:
class
Threshold_noise
:
...
@@ -152,7 +154,9 @@ class ImageFolderDuo(data.Dataset):
...
@@ -152,7 +154,9 @@ class ImageFolderDuo(data.Dataset):
def
__len__
(
self
):
def
__len__
(
self
):
return
len
(
self
.
imlist
)
return
len
(
self
.
imlist
)
def
load_data_duo
(
base_dir_train
,
base_dir_test
,
batch_size
,
shuffle
=
True
,
noise_threshold
=
0
,
ref_dir
=
None
,
positive_prop
=
None
):
def
load_data_duo
(
base_dir_train
,
base_dir_test
,
batch_size
,
shuffle
=
True
,
noise_threshold
=
0
,
ref_dir
=
None
,
positive_prop
=
None
,
sampler
=
None
):
train_transform
=
transforms
.
Compose
(
train_transform
=
transforms
.
Compose
(
[
transforms
.
Resize
((
224
,
224
)),
[
transforms
.
Resize
((
224
,
224
)),
...
@@ -180,14 +184,32 @@ def load_data_duo(base_dir_train, base_dir_test, batch_size, shuffle=True, noise
...
@@ -180,14 +184,32 @@ def load_data_duo(base_dir_train, base_dir_test, batch_size, shuffle=True, noise
train_dataset
=
ImageFolderDuo
(
root
=
base_dir_train
,
transform
=
train_transform
,
ref_dir
=
ref_dir
,
positive_prop
=
positive_prop
,
ref_transform
=
ref_transform
)
train_dataset
=
ImageFolderDuo
(
root
=
base_dir_train
,
transform
=
train_transform
,
ref_dir
=
ref_dir
,
positive_prop
=
positive_prop
,
ref_transform
=
ref_transform
)
val_dataset
=
ImageFolderDuo_Batched
(
root
=
base_dir_test
,
transform
=
val_transform
,
ref_dir
=
ref_dir
,
ref_transform
=
ref_transform
)
val_dataset
=
ImageFolderDuo_Batched
(
root
=
base_dir_test
,
transform
=
val_transform
,
ref_dir
=
ref_dir
,
ref_transform
=
ref_transform
)
data_loader_train
=
data
.
DataLoader
(
if
sampler
==
'
weighted
'
:
dataset
=
train_dataset
,
y_train_label
=
np
.
array
([
i
for
(
_
,
_
,
i
)
in
train_dataset
.
imlist
])
batch_size
=
batch_size
,
class_sample_count
=
np
.
array
([
len
(
np
.
where
(
y_train_label
==
t
)[
0
])
for
t
in
np
.
unique
(
y_train_label
)])
shuffle
=
shuffle
,
weight
=
1.
/
class_sample_count
num_workers
=
0
,
samples_weight
=
np
.
array
([
weight
[
t
]
for
t
in
y_train_label
])
collate_fn
=
None
,
pin_memory
=
False
,
samples_weight
=
torch
.
from_numpy
(
samples_weight
)
)
sampler
=
WeightedRandomSampler
(
samples_weight
.
type
(
'
torch.DoubleTensor
'
),
len
(
samples_weight
))
data_loader_train
=
data
.
DataLoader
(
dataset
=
train_dataset
,
batch_size
=
batch_size
,
sampler
=
sampler
,
num_workers
=
0
,
collate_fn
=
None
,
pin_memory
=
False
,
)
else
:
data_loader_train
=
data
.
DataLoader
(
dataset
=
train_dataset
,
batch_size
=
batch_size
,
shuffle
=
shuffle
,
num_workers
=
0
,
collate_fn
=
None
,
pin_memory
=
False
,
)
data_loader_test
=
data
.
DataLoader
(
data_loader_test
=
data
.
DataLoader
(
dataset
=
val_dataset
,
dataset
=
val_dataset
,
...
...
This diff is collapsed.
Click to expand it.
image_ref/main.py
+
1
−
1
View file @
24c47521
...
@@ -74,7 +74,7 @@ def test_duo(model, data_test, loss_function, epoch):
...
@@ -74,7 +74,7 @@ def test_duo(model, data_test, loss_function, epoch):
def
run_duo
(
args
):
def
run_duo
(
args
):
#load data
#load data
data_train
,
data_test_batch
=
load_data_duo
(
base_dir_train
=
args
.
dataset_train_dir
,
base_dir_test
=
args
.
dataset_val_dir
,
batch_size
=
args
.
batch_size
,
data_train
,
data_test_batch
=
load_data_duo
(
base_dir_train
=
args
.
dataset_train_dir
,
base_dir_test
=
args
.
dataset_val_dir
,
batch_size
=
args
.
batch_size
,
ref_dir
=
args
.
dataset_ref_dir
,
positive_prop
=
args
.
positive_prop
)
ref_dir
=
args
.
dataset_ref_dir
,
positive_prop
=
args
.
positive_prop
,
sampler
=
args
.
sampler
)
#load model
#load model
model
=
Classification_model_duo_contrastive
(
model
=
args
.
model
,
n_class
=
2
)
model
=
Classification_model_duo_contrastive
(
model
=
args
.
model
,
n_class
=
2
)
...
...
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