Fixed missing package dependency list issue, fixed package install in…

…structions Signed-off-by: Bharath Ramaswamy <[email protected]>
quic · Dec 24, 2021 · 50fa4d0 · 50fa4d0
1 parent 42e8612
commit 50fa4d0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/packaging/install.md b/packaging/install.md
@@ -37,23 +37,31 @@ export AIMET_VARIANT=<variant_string>
 
 Replace `<release_tag>` in the steps below with the appropriate tag:
 ```bash
-release_tag=<release_tag>
+export release_tag=<release_tag>
+```
+
+Set the package download URL as follows:
+```bash
+download_url="https://github.com/quic/aimet/releases/download/${release_tag}"
+```
+
+Set the common suffix for the package files as follows:
+> _NOTE:_ Set wheel_file_suffix to `cp36-cp36m-linux_x86_64` OR `cp37-cp37m-linux_x86_64` OR `py3-none-any` as appropriate depending on the actual wheel filename(s) on the [releases page](https://github.com/quic/aimet/releases).
+```bash
+export wheel_file_suffix="cp36-cp36m-linux_x86_64.whl"
 ```
 
 Install the AIMET packages in the order specified below:
-> _NOTE:_
->   - Python dependencies will automatically get installed.
->   - Replace `py3-none-any` with `cp36-cp36m-linux_x86_64` OR `cp37-cp37m-linux_x86_64` as appropriate depending on the actual wheel filename(s) on the [releases page](https://github.com/quic/aimet/releases).
+> _NOTE:_ Python dependencies will automatically get installed.
 ```bash
-release_tag=<release_tag>
-python3 -m pip install https://github.com/quic/aimet/releases/download/${release_tag}/AimetCommon-${AIMET_VARIANT}_${release_tag}-py3-none-any.whl
+python3 -m pip install ${download_url}/AimetCommon-${AIMET_VARIANT}_${release_tag}-${wheel_file_suffix}
 
 # Install ONE of the following depending on the variant
-python3 -m pip install https://github.com/quic/aimet/releases/download/${release_tag}/AimetTorch-${AIMET_VARIANT}_${release_tag}-py3-none-any.whl -f https://download.pytorch.org/whl/torch_stable.html
+python3 -m pip install ${download_url}/AimetTorch-${AIMET_VARIANT}_${release_tag}-${wheel_file_suffix} -f https://download.pytorch.org/whl/torch_stable.html
 # OR
-python3 -m pip install https://github.com/quic/aimet/releases/download/${release_tag}/AimetTensorflow-${AIMET_VARIANT}_${release_tag}-py3-none-any.whl
+python3 -m pip install ${download_url}/AimetTensorflow-${AIMET_VARIANT}_${release_tag}-${wheel_file_suffix}
 
-python3 -m pip install https://github.com/quic/aimet/releases/download/${release_tag}/Aimet-${AIMET_VARIANT}_${release_tag}-py3-none-any.whl
+python3 -m pip install ${download_url}/Aimet-${AIMET_VARIANT}_${release_tag}-${wheel_file_suffix}
 ```
 
 ### Install common debian packages

diff --git a/packaging/setup_aimet_tensorflow.py b/packaging/setup_aimet_tensorflow.py
@@ -62,13 +62,13 @@
 install_requires_list = get_dependency_packages(package_name, 'reqs_pip_tf_common.txt')
 if "--gpu" in sys.argv:
     # Create Tensorflow GPU dependency list
-    package_dependency_files.extend(['bin/reqs_pip_tf_gpu.txt', 'bin/reqs_deb_tf_gpu.txt'])
+    package_dependency_files.extend(['reqs_pip_tf_gpu.txt', 'reqs_deb_tf_gpu.txt'])
     install_requires_list.extend(get_dependency_packages(package_name, 'reqs_pip_tf_gpu.txt'))
     dependency_url_list.extend(get_dependency_urls(package_name, 'reqs_pip_tf_gpu.txt'))
     sys.argv.remove("--gpu")
 else:
     # Create Tensorflow CPU dependency list
-    package_dependency_files.extend(['bin/reqs_pip_tf_cpu.txt'])
+    package_dependency_files.extend(['reqs_pip_tf_cpu.txt'])
     install_requires_list.extend(get_dependency_packages(package_name, 'reqs_pip_tf_cpu.txt'))
     dependency_url_list.extend(get_dependency_urls(package_name, 'reqs_pip_tf_cpu.txt'))
 

diff --git a/packaging/setup_aimet_torch.py b/packaging/setup_aimet_torch.py
@@ -62,13 +62,13 @@
 install_requires_list = get_dependency_packages(package_name, 'reqs_pip_torch_common.txt')
 if "--gpu" in sys.argv:
     # Create Torch GPU dependency list
-    package_dependency_files.extend(['bin/reqs_pip_torch_gpu.txt', 'bin/reqs_deb_torch_gpu.txt'])
+    package_dependency_files.extend(['reqs_pip_torch_gpu.txt', 'reqs_deb_torch_gpu.txt'])
     install_requires_list.extend(get_dependency_packages(package_name, 'reqs_pip_torch_gpu.txt'))
     dependency_url_list.extend(get_dependency_urls(package_name, 'reqs_pip_torch_gpu.txt'))
     sys.argv.remove("--gpu")
 else:
     # Create Torch CPU dependency list
-    package_dependency_files.extend(['bin/reqs_pip_torch_cpu.txt'])
+    package_dependency_files.extend(['reqs_pip_torch_cpu.txt'])
     install_requires_list.extend(get_dependency_packages(package_name, 'reqs_pip_torch_cpu.txt'))
     dependency_url_list.extend(get_dependency_urls(package_name, 'reqs_pip_torch_cpu.txt'))