merge master

Signed-off-by: sdp <[email protected]>

Author: sdp

.azure-pipelines/code-scan-neural-insights.yaml

@@ -36,7 +36,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
 
 RUN ln -sf $(which python3) /usr/bin/python
 
-RUN python -m pip --no-cache-dir install --upgrade pip
+RUN python -m pip install pip==24.0
 RUN python -m pip install --no-cache-dir setuptools
 
 RUN pip list

.azure-pipelines/code-scan-neural-solution.yaml

@@ -57,7 +57,7 @@ parameters:
   - name: PyTorchModelList
     type: object
     default:
-      - resnet18
+#      - resnet18
       - resnet18_fx
   - name: ONNXModelList
     type: object

.azure-pipelines/docker/Dockerfile.devel

@@ -17,11 +17,6 @@ log_dir="$work_dir/../scanLog"
 mkdir -p $log_dir
 
 scan_path="scan_path.txt"
-if [ "${scan_module}" = "neural_solution" ]; then
-    scan_path="scan_path_neural_solution.txt"
-elif [ "${scan_module}" = "neural_insights" ]; then
-    scan_path="scan_path_neural_insights.txt"
-fi
 
 exit_code=0
 for line in $(cat ${work_dir}/${scan_path})

.azure-pipelines/model-test.yml

@@ -44,22 +44,6 @@ pip install torch \
             pydantic \
             protobuf
 
-if [ "${scan_module}" = "neural_solution" ]; then
-    cd /neural-compressor
-    python setup.py install
-
-    echo "Install Neural Solution ... "
-    bash /neural-compressor/.azure-pipelines/scripts/install_neural_solution.sh
-
-elif [ "${scan_module}" = "neural_insights" ]; then
-    cd /neural-compressor
-    python setup.py install
-
-    echo "Install Neural Insights ... "
-    bash /neural-compressor/.azure-pipelines/scripts/install_neural_insights.sh
-
-fi
-
 echo "[DEBUG] list pipdeptree..."
 pip install pipdeptree
 pipdeptree

.azure-pipelines/scripts/codeScan/pydocstyle/pydocstyle.sh

@@ -2,10 +2,10 @@
 
 echo -e "\n Install Neural Compressor ... "
 cd /neural-compressor
-if [[ $1 = *"3x_pt" ]]; then
+if [[ $1 = *"3x_pt"* ]]; then
     python -m pip install --no-cache-dir -r requirements_pt.txt
     python setup.py pt bdist_wheel
-    pip install dist/neural_compressor*.whl --force-reinstall
+    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