Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d0495f7
Add LLaMA and Whisper scripts
kunal-vaishnavi Aug 6, 2023
5bfde7a
Undo some linter changes
kunal-vaishnavi Aug 6, 2023
2701a52
Move noqa after linter changes
kunal-vaishnavi Aug 6, 2023
24ef7a0
Remove initial comments to satisfy linter
kunal-vaishnavi Aug 6, 2023
9d56243
Update whisper readme
kunal-vaishnavi Aug 6, 2023
78e7074
Use export and convert methods directly
kunal-vaishnavi Aug 7, 2023
7210fe9
Remove Whisper scripts
kunal-vaishnavi Aug 8, 2023
cce84c9
Update markdown style
kunal-vaishnavi Aug 8, 2023
7c18d4f
Address PR feedback
kunal-vaishnavi Aug 9, 2023
fc0e372
Add period at end of sentence
kunal-vaishnavi Aug 9, 2023
97f8c59
Add blank end of line
kunal-vaishnavi Aug 9, 2023
4f66dc9
Remove masked fill and add SmoothQuant
kunal-vaishnavi Aug 10, 2023
e75e807
Update all scripts
kunal-vaishnavi Aug 15, 2023
7755c29
Remove masked fill
kunal-vaishnavi Aug 15, 2023
db1d4dc
Fix CodeQL errors
kunal-vaishnavi Aug 15, 2023
6466b78
Remove unused noqa directives
kunal-vaishnavi Aug 16, 2023
8cc4903
Update log verbosity level
kunal-vaishnavi Aug 16, 2023
bfa145e
Update README and CUDA requirements
kunal-vaishnavi Aug 17, 2023
83a5af4
Address PR feedback
kunal-vaishnavi Aug 18, 2023
0630df8
Update init and remove path appends
kunal-vaishnavi Aug 18, 2023
1422309
Merge branch 'main' into kvaishnavi/add-llama-and-whisper-scripts
kunal-vaishnavi Aug 18, 2023
fae7cae
Update script invocations in README
kunal-vaishnavi Aug 18, 2023
73d0576
Update benchmarking docs
kunal-vaishnavi Aug 18, 2023
f1e869e
Update README formatting
kunal-vaishnavi Aug 20, 2023
86661d5
Update path navigation
kunal-vaishnavi Aug 20, 2023
eeb2a07
Update version number in README
kunal-vaishnavi Aug 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cmake/onnxruntime_python.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,9 @@ file(GLOB onnxruntime_python_transformers_models_bert_src CONFIGURE_DEPENDS
file(GLOB onnxruntime_python_transformers_models_gpt2_src CONFIGURE_DEPENDS
"${ONNXRUNTIME_ROOT}/python/tools/transformers/models/gpt2/*.py"
)
file(GLOB onnxruntime_python_transformers_models_llama_src CONFIGURE_DEPENDS
"${ONNXRUNTIME_ROOT}/python/tools/transformers/models/llama/*.py"
)
file(GLOB onnxruntime_python_transformers_models_longformer_src CONFIGURE_DEPENDS
"${ONNXRUNTIME_ROOT}/python/tools/transformers/models/longformer/*.py"
)
Expand Down Expand Up @@ -534,6 +537,7 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/bart
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/bert
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/gpt2
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/llama
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/longformer
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/stable_diffusion
COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/t5
Expand Down Expand Up @@ -625,6 +629,9 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy
${onnxruntime_python_transformers_models_gpt2_src}
$<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/gpt2/
COMMAND ${CMAKE_COMMAND} -E copy
${onnxruntime_python_transformers_models_llama_src}
$<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/llama/
COMMAND ${CMAKE_COMMAND} -E copy
${onnxruntime_python_transformers_models_longformer_src}
$<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/transformers/models/longformer/
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/python/tools/transformers/benchmark_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def prepare_environment(cache_dir, output_dir, use_gpu, provider=None):

logger.info(f"PyTorch Version:{torch.__version__}")
logger.info(f"Transformers Version:{transformers.__version__}")
logger.info(f"Onnxruntime Version:{onnxruntime.__version__}")
logger.info(f"OnnxRuntime Version:{onnxruntime.__version__}")

# Support three major versions of PyTorch and OnnxRuntime, and up to 9 months of transformers.
assert version.parse(torch.__version__) >= version.parse("1.10.0")
Expand Down
110 changes: 110 additions & 0 deletions onnxruntime/python/tools/transformers/models/llama/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
# LLaMA

## Exporting LLaMA

There are two ways to export LLaMA models such as LLaMA and LLaMA2 (using LLaMA2 7B as an example).

Option 1: from source
```
$ git clone https://github.com/microsoft/onnxruntime
$ cd onnxruntime/onnxruntime/python/tools/transformers/models/llama
$ python3 convert_to_onnx.py -m meta-llama/Llama-2-7b-hf --output llama2-7b
```

Option 2: from wheel
```
$ python3 -m onnxruntime.transformers.models.llama.convert_to_onnx -m meta-llama/Llama-2-7b-hf --output llama2-7b
```

# Examples of Exporting LLaMA

Here are some additional examples for exporting LLaMA.

## Export Saved Model on Disk
```
# From source:
$ python3 convert_to_onnx.py -m meta-llama/Llama-2-7b-hf --input ./Llama-2-7b-hf --output ./llama2-7b

# From wheel:
$ python3 -m onnxruntime.transformers.models.llama.convert_to_onnx -m meta-llama/Llama-2-7b-hf --input ./Llama-2-7b-hf --output ./llama2-7b
```

## Export with Different Precision

FP16:
```
# From source:
$ python3 convert_to_onnx.py -m meta-llama/Llama-2-7b-hf --output llama2-7b --precision fp16

# From wheel:
$ python3 -m onnxruntime.transformers.models.llama.convert_to_onnx -m meta-llama/Llama-2-7b-hf --output llama2-7b --precision fp16
```

INT8:
```
# From source:
$ python3 convert_to_onnx.py -m meta-llama/Llama-2-7b-hf --output llama2-7b --precision int8 --quantize_embedding_layer

# From wheel:
$ python3 -m onnxruntime.transformers.models.llama.convert_to_onnx -m meta-llama/Llama-2-7b-hf --output llama2-7b --precision int8 --quantize_embedding_layer
```

## Benchmark LLaMA

Here are some examples of how you can benchmark LLaMA.

Note: In the below examples, `PyTorch` refers to running in PyTorch without `torch.compile` and `PyTorch 2.0` refers to running in PyTorch with `torch.compile`.

### Variants

1) PyTorch (without `torch.compile`), FP32, Hugging Face `generate()` and `decode()` API
Comment thread
kunal-vaishnavi marked this conversation as resolved.
Outdated
```
python3 benchmark.py \
--benchmark-type hf-pt \
--model-name meta-llama/Llama-2-7b-hf \
--model-size 7b \
--precision fp32 \
--batch-size 2 \
--device cpu \
--prompt "Hey, are you conscious? Can you talk to me?" \
--auth
```

2) PyTorch 2.0 (with `torch.compile`), FP16, Hugging Face `generate()` and `decode()` API
```
python3 benchmark.py \
--benchmark-type hf-pt2 \
--model-name meta-llama/Llama-2-7b-hf \
--model-size 7b \
--precision fp16 \
--batch-size 2 \
--device cuda \
--prompt "Hey, are you conscious? Can you talk to me?" \
--auth
```

3) ONNX Runtime, FP32
```
python3 benchmark.py \
--benchmark-type ort \
--ort-model-path llama-2-onnx/7B_float32/ONNX/LlamaV2_7B_float32.onnx \
--model-name meta-llama/Llama-2-7b-hf \
--model-size 7b \
--precision fp32 \
--batch-size 1 \
--sequence-length 16 \
--device cpu
```

4) ONNX Runtime, FP16
```
python3 benchmark.py \
--benchmark-type ort \
--ort-model-path llama-2-onnx/7B_float16/ONNX/LlamaV2_7B_float16.onnx \
--model-name meta-llama/Llama-2-7b-hf \
--model-size 7b \
--precision fp16 \
--batch-size 1 \
--sequence-length 16 \
--device cuda
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
# --------------------------------------------------------------------------
import os
import sys

sys.path.append(os.path.dirname(__file__))
Comment thread
kunal-vaishnavi marked this conversation as resolved.
Loading