Skip to content

Commit 30e72a0

Browse files
committed
Fix yaml import
1 parent a9a09d6 commit 30e72a0

6 files changed

+28
-11
lines changed

experts/generate_depth.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66

77
import torch
88
import os
9-
import ruamel_yaml as yaml
10-
9+
try:
10+
import ruamel_yaml as yaml
11+
except ModuleNotFoundError:
12+
import ruamel.yaml as yaml
13+
1114
from experts.model_bank import load_expert_model
1215
from experts.depth.generate_dataset import Dataset
1316
import PIL.Image as Image

experts/generate_edge.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
import torch
88
import os
9-
import ruamel_yaml as yaml
9+
try:
10+
import ruamel_yaml as yaml
11+
except ModuleNotFoundError:
12+
import ruamel.yaml as yaml
1013

1114
from experts.model_bank import load_expert_model
1215
from experts.edge.generate_dataset import Dataset

experts/generate_normal.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66

77
import torch
88
import os
9-
import ruamel_yaml as yaml
10-
9+
try:
10+
import ruamel_yaml as yaml
11+
except ModuleNotFoundError:
12+
import ruamel.yaml as yaml
13+
1114
from experts.model_bank import load_expert_model
1215
from experts.normal.generate_dataset import CustomDataset
1316
import PIL.Image as Image

experts/generate_objdet.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66

77
import torch
88
import os
9-
import ruamel_yaml as yaml
109
import json
1110
import copy
1211
import PIL.Image as Image
13-
12+
try:
13+
import ruamel_yaml as yaml
14+
except ModuleNotFoundError:
15+
import ruamel.yaml as yaml
16+
1417
from experts.model_bank import load_expert_model
1518
from experts.obj_detection.generate_dataset import Dataset, collate_fn
1619
from accelerate import Accelerator

experts/generate_ocrdet.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
import cv2
1212
import clip
1313
import pickle as pk
14-
import ruamel_yaml as yaml
15-
14+
try:
15+
import ruamel_yaml as yaml
16+
except ModuleNotFoundError:
17+
import ruamel.yaml as yaml
1618

1719
from experts.model_bank import load_expert_model
1820
from experts.ocr_detection.generate_dataset import Dataset

experts/generate_segmentation.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import torch
88
import os
99
import PIL.Image as Image
10-
import ruamel_yaml as yaml
11-
10+
try:
11+
import ruamel_yaml as yaml
12+
except ModuleNotFoundError:
13+
import ruamel.yaml as yaml
14+
1215
from experts.model_bank import load_expert_model
1316
from experts.segmentation.generate_dataset import Dataset, collate_fn
1417
from accelerate import Accelerator

0 commit comments

Comments
 (0)