Skip to content

Commit

Permalink
Merge branch 'master' into zixuan/sdxl
Browse files Browse the repository at this point in the history
  • Loading branch information
violetch24 authored Jul 29, 2024
2 parents ad0e7d9 + 50eb6fb commit b614b82
Show file tree
Hide file tree
Showing 309 changed files with 45,705 additions and 7,703 deletions.
10 changes: 10 additions & 0 deletions .azure-pipelines/scripts/codeScan/pydocstyle/scan_path.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,13 @@
/neural-compressor/neural_compressor/strategy
/neural-compressor/neural_compressor/training.py
/neural-compressor/neural_compressor/utils
/neural_compressor/torch/algorithms/mx_quant
/neural-compressor/neural_compressor/torch/algorithms/static_quant
/neural-compressor/neural_compressor/torch/algorithms/smooth_quant
/neural_compressor/torch/algorithms/pt2e_quant
/neural_compressor/torch/export
/neural_compressor/common
/neural_compressor/torch/algorithms/weight_only
/neural_compressor/torch/algorithms/layer_wise
/neural_compressor/torch/algorithms/mixed_precision
/neural_compressor/tensorflow
8 changes: 4 additions & 4 deletions .azure-pipelines/scripts/install_nc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
echo -e "\n Install Neural Compressor ... "
cd /neural-compressor
if [[ $1 = *"3x_pt"* ]]; then
if [[ $1 != *"3x_pt_fp8"* ]]; then
echo -e "\n Install torch CPU ... "
pip install torch==2.3.0 --index-url https://download.pytorch.org/whl/cpu
fi
python -m pip install --no-cache-dir -r requirements_pt.txt
python setup.py pt bdist_wheel
pip install --no-deps dist/neural_compressor*.whl --force-reinstall
elif [[ $1 = *"3x_tf"* ]]; then
python -m pip install --no-cache-dir -r requirements_tf.txt
python setup.py tf bdist_wheel
pip install dist/neural_compressor*.whl --force-reinstall
elif [[ $1 = *"3x_ort" ]]; then
python -m pip install --no-cache-dir -r requirements_ort.txt
python setup.py ort bdist_wheel
pip install dist/neural_compressor*.whl --force-reinstall
else
python -m pip install --no-cache-dir -r requirements.txt
python setup.py bdist_wheel
Expand Down
15 changes: 0 additions & 15 deletions .azure-pipelines/scripts/ut/3x/coverage.3x_ort

This file was deleted.

35 changes: 0 additions & 35 deletions .azure-pipelines/scripts/ut/3x/run_3x_ort.sh

This file was deleted.

2 changes: 2 additions & 0 deletions .azure-pipelines/scripts/ut/3x/run_3x_tf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ ut_log_name=${LOG_DIR}/ut_3x_tf.log
# test for tensorflow ut
pytest --cov="${inc_path}" -vs --disable-warnings --html=report_tf_quant.html --self-contained-html ./tensorflow/quantization 2>&1 | tee -a ${ut_log_name}
rm -rf tensorflow/quantization
pytest --cov="${inc_path}" --cov-append -vs --disable-warnings --html=report_tf_test_quantize_model.html --self-contained-html ./tensorflow/test_quantize_model.py 2>&1 | tee -a ${ut_log_name}
rm -rf tensorflow/test_quantize_model.py
pytest --cov="${inc_path}" --cov-append -vs --disable-warnings --html=report_tf.html --self-contained-html . 2>&1 | tee -a ${ut_log_name}

# test for tensorflow new api ut
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/scripts/ut/env_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ elif [[ $(echo "${test_case}" | grep -c "tf pruning") != 0 ]]; then
fi

if [[ $(echo "${test_case}" | grep -c "api") != 0 ]] || [[ $(echo "${test_case}" | grep -c "adaptor") != 0 ]]; then
pip install git+https://github.com/intel/auto-round.git@24b2e74070f2b4e6f26ff069ec75af74cf5b177c
pip install git+https://github.com/intel/auto-round.git@e24b9074af6cdb099e31c92eb81b7f5e9a4a244e
fi

# test deps
Expand Down
109 changes: 0 additions & 109 deletions .azure-pipelines/ut-3x-ort.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/checkgroup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,3 @@ subprojects:
- "UT-3x-Torch (Coverage Compare CollectDatafiles)"
- "UT-3x-Torch (Unit Test 3x Torch Unit Test 3x Torch)"
- "UT-3x-Torch (Unit Test 3x Torch baseline Unit Test 3x Torch baseline)"

- id: "Unit Tests 3x-ONNXRT workflow"
paths:
- "neural_compressor/common/**"
- "neural_compressor/onnxrt/**"
- "test/3x/onnxrt/**"
- "setup.py"
- "requirements_ort.txt"
checks:
- "UT-3x-ONNXRT"
- "UT-3x-ONNXRT (Coverage Compare CollectDatafiles)"
- "UT-3x-ONNXRT (Unit Test 3x ONNXRT Unit Test 3x ONNXRT)"
- "UT-3x-ONNXRT (Unit Test 3x ONNXRT baseline Unit Test 3x ONNXRT baseline)"
1 change: 1 addition & 0 deletions .github/workflows/Scanner_Bdba.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Scanner BDBA
permissions: read-all

on:
workflow_dispatch:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/Scanner_Coverity.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Scanner Coverity
permissions: read-all

on:
workflow_dispatch:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/Scanner_McAfee.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Virus Scan
permissions: read-all

on:
workflow_dispatch:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/probot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Probot
permissions: read-all

on:
pull_request:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Publish
permissions: {}

on:
push:
Expand All @@ -7,9 +8,10 @@ on:

jobs:
build:

runs-on: ubuntu-latest

permissions:
pull-requests: write
contents: write
steps:
- uses: actions/checkout@v3
- name: Build Online Document
Expand Down
Loading

0 comments on commit b614b82

Please sign in to comment.