Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit aaf4549

Browse files
saddam213saddam213
committed
Remove inference from convert scripts
1 parent c6b097b commit aaf4549

26 files changed

+697
-1445
lines changed

‎OnnxStack.Converter/latent_consistency/.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
/footprints/
2-
/cache/
1+
/*
32
/result_*.png

‎OnnxStack.Converter/latent_consistency/config_controlnet.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"model_loader": "controlnet_unet_load",
77
"model_script": "models.py",
88
"io_config": {
9-
"input_names": [ "sample", "timestep", "encoder_hidden_states", "down_block_0_additional_residual", "down_block_1_additional_residual", "down_block_2_additional_residual", "down_block_3_additional_residual", "down_block_4_additional_residual", "down_block_5_additional_residual", "down_block_6_additional_residual", "down_block_7_additional_residual", "down_block_8_additional_residual", "down_block_9_additional_residual", "down_block_10_additional_residual", "down_block_11_additional_residual", "mid_block_additional_residual", "return_dict" ],
9+
"input_names": [ "sample", "timestep", "encoder_hidden_states", "timestep_cond", "down_block_0_additional_residual", "down_block_1_additional_residual", "down_block_2_additional_residual", "down_block_3_additional_residual", "down_block_4_additional_residual", "down_block_5_additional_residual", "down_block_6_additional_residual", "down_block_7_additional_residual", "down_block_8_additional_residual", "down_block_9_additional_residual", "down_block_10_additional_residual", "down_block_11_additional_residual", "mid_block_additional_residual" ],
1010
"output_names": [ "out_sample" ],
1111
"dynamic_axes": {
1212
"sample": {"0": "unet_sample_batch", "1": "unet_sample_channels", "2": "unet_sample_height", "3": "unet_sample_width"},
@@ -66,10 +66,9 @@
6666
"convert": {
6767
"type": "OnnxConversion",
6868
"config": {
69-
"target_opset": 14,
69+
"target_opset": 16,
7070
"save_as_external_data": true,
71-
"all_tensors_to_one_file": true,
72-
"external_data_name": "weights.pb"
71+
"all_tensors_to_one_file": true
7372
}
7473
},
7574
"optimize": {

‎OnnxStack.Converter/latent_consistency/config_safety_checker.json‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,7 @@
5151
"convert": {
5252
"type": "OnnxConversion",
5353
"config": {
54-
"target_opset": 14
55-
}
56-
},
57-
"ov_convert": {
58-
"type": "OpenVINOConversion",
59-
"config": {
60-
"user_script": "models.py",
61-
"example_input_func": "safety_checker_conversion_inputs",
62-
"output_model": "safety_checker"
54+
"target_opset": 16
6355
}
6456
},
6557
"optimize": {
@@ -96,16 +88,6 @@
9688
"GroupNorm": [0, 1, 2]
9789
}
9890
}
99-
},
100-
"optimize_cuda": {
101-
"type": "OrtTransformersOptimization",
102-
"config": {
103-
"model_type": "unet",
104-
"opt_level": 0,
105-
"float16": true,
106-
"use_gpu": true,
107-
"keep_io_types": false
108-
}
10991
}
11092
},
11193
"pass_flows": [

‎OnnxStack.Converter/latent_consistency/config_text_encoder.json‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,7 @@
4848
"convert": {
4949
"type": "OnnxConversion",
5050
"config": {
51-
"target_opset": 14
52-
}
53-
},
54-
"ov_convert": {
55-
"type": "OpenVINOConversion",
56-
"config": {
57-
"user_script": "models.py",
58-
"example_input_func": "text_encoder_conversion_inputs",
59-
"output_model": "text_encoder"
51+
"target_opset": 16
6052
}
6153
},
6254
"optimize": {
@@ -93,16 +85,6 @@
9385
"GroupNorm": [0, 1, 2]
9486
}
9587
}
96-
},
97-
"optimize_cuda": {
98-
"type": "OrtTransformersOptimization",
99-
"config": {
100-
"model_type": "clip",
101-
"opt_level": 0,
102-
"float16": true,
103-
"use_gpu": true,
104-
"keep_io_types": false
105-
}
10688
}
10789
},
10890
"pass_flows": [

‎OnnxStack.Converter/latent_consistency/config_unet.json‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"model_loader": "unet_load",
77
"model_script": "models.py",
88
"io_config": {
9-
"input_names": [ "sample", "timestep", "encoder_hidden_states", "timestep_cond", "return_dict" ],
9+
"input_names": [ "sample", "timestep", "encoder_hidden_states", "timestep_cond" ],
1010
"output_names": [ "out_sample" ],
1111
"dynamic_axes": {
1212
"sample": {"0": "unet_sample_batch", "1": "unet_sample_channels", "2": "unet_sample_height", "3": "unet_sample_width"},
@@ -53,18 +53,9 @@
5353
"convert": {
5454
"type": "OnnxConversion",
5555
"config": {
56-
"target_opset": 14,
56+
"target_opset": 16,
5757
"save_as_external_data": true,
58-
"all_tensors_to_one_file": true,
59-
"external_data_name": "weights.pb"
60-
}
61-
},
62-
"ov_convert": {
63-
"type": "OpenVINOConversion",
64-
"config": {
65-
"user_script": "models.py",
66-
"example_input_func": "get_unet_ov_example_input",
67-
"output_model": "unet"
58+
"all_tensors_to_one_file": true
6859
}
6960
},
7061
"optimize": {
@@ -101,16 +92,6 @@
10192
"GroupNorm": [0, 1, 2]
10293
}
10394
}
104-
},
105-
"optimize_cuda": {
106-
"type": "OrtTransformersOptimization",
107-
"config": {
108-
"model_type": "unet",
109-
"opt_level": 0,
110-
"float16": true,
111-
"use_gpu": true,
112-
"keep_io_types": false
113-
}
11495
}
11596
},
11697
"pass_flows": [

‎OnnxStack.Converter/latent_consistency/config_vae_decoder.json‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"model_loader": "vae_decoder_load",
77
"model_script": "models.py",
88
"io_config": {
9-
"input_names": [ "latent_sample", "return_dict" ],
9+
"input_names": [ "latent_sample" ],
1010
"output_names": [ "sample" ],
1111
"dynamic_axes": { "latent_sample": { "0": "batch", "1": "channels", "2": "height", "3": "width" } }
1212
},
@@ -48,15 +48,7 @@
4848
"convert": {
4949
"type": "OnnxConversion",
5050
"config": {
51-
"target_opset": 14
52-
}
53-
},
54-
"ov_convert": {
55-
"type": "OpenVINOConversion",
56-
"config": {
57-
"user_script": "models.py",
58-
"example_input_func": "vae_decoder_conversion_inputs",
59-
"output_model": "vae_decoder"
51+
"target_opset": 16
6052
}
6153
},
6254
"optimize": {
@@ -93,16 +85,6 @@
9385
"GroupNorm": [0, 1, 2]
9486
}
9587
}
96-
},
97-
"optimize_cuda": {
98-
"type": "OrtTransformersOptimization",
99-
"config": {
100-
"model_type": "vae",
101-
"opt_level": 0,
102-
"float16": true,
103-
"use_gpu": true,
104-
"keep_io_types": false
105-
}
10688
}
10789
},
10890
"pass_flows": [

‎OnnxStack.Converter/latent_consistency/config_vae_encoder.json‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"model_loader": "vae_encoder_load",
77
"model_script": "models.py",
88
"io_config": {
9-
"input_names": [ "sample", "return_dict" ],
9+
"input_names": [ "sample" ],
1010
"output_names": [ "latent_sample" ],
1111
"dynamic_axes": { "sample": { "0": "batch", "1": "channels", "2": "height", "3": "width" } }
1212
},
@@ -48,15 +48,7 @@
4848
"convert": {
4949
"type": "OnnxConversion",
5050
"config": {
51-
"target_opset": 14
52-
}
53-
},
54-
"ov_convert": {
55-
"type": "OpenVINOConversion",
56-
"config": {
57-
"user_script": "models.py",
58-
"example_input_func": "vae_encoder_conversion_inputs",
59-
"output_model": "vae_encoder"
51+
"target_opset": 16
6052
}
6153
},
6254
"optimize": {
@@ -93,16 +85,6 @@
9385
"GroupNorm": [0, 1, 2]
9486
}
9587
}
96-
},
97-
"optimize_cuda": {
98-
"type": "OrtTransformersOptimization",
99-
"config": {
100-
"model_type": "vae",
101-
"opt_level": 0,
102-
"float16": true,
103-
"use_gpu": true,
104-
"keep_io_types": false
105-
}
10688
}
10789
},
10890
"pass_flows": [

0 commit comments

Comments
 (0)