Merge pull request #118 from johnolafenwa/joolafen/windows-fix

Joolafen/windows fix
johnolafenwa · Oct 3, 2021 · 860bd0e · 860bd0e
2 parents 2bc54ac + 6945061
commit 860bd0e
Show file tree

Hide file tree

Showing 301 changed files with 32 additions and 204 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +0,0 @@
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -29,6 +29,9 @@ jobs:
         sudo apt-get update
         sudo add-apt-repository universe
         sudo apt-get install -y powershell
+    - name: Download Binary Dependencies
+      run: .\download_dependencies.ps1
+      shell: pwsh
     - name: Build DeepStack Go Component
       run: cd server && go build
     - name: Build DeepStack CPU Version
@@ -88,6 +91,8 @@ jobs:
         run: pip install pytest requests
       - name: Setup Golang
         uses: actions/setup-go@v2
+      - name: Download Binary Dependencies
+        run: .\download_dependencies.ps1
       - name: Build DeepStack Go Component
         run: cd server && go build -o deepstack.exe
       - name: Generate CPU Build Script
@@ -104,7 +109,7 @@ jobs:
           $ErrorActionPreference = "Stop"
           $env:TEST_DATA_DIR=[System.IO.Directory]::GetCurrentDirectory()+"\tests\test_data"
           $env:TEST_DEEPSTACK_URL="http://localhost:80"
-          Start-Process -FilePath "C:\DeepStack\deepstack.exe" -ArgumentList "--PORT 80" -NoNewWindow
+          Start-Process -FilePath "C:\DeepStack\deepstack.exe" -ArgumentList "--VISION-SCENE=True --PORT 80" -NoNewWindow
           Start-Sleep 30
           cd scene
           python -m pytest

diff --git a/.gitignore b/.gitignore
@@ -12,10 +12,13 @@ __pycache__/
 *.so
 
 *.exe
-!windows_packages/*.exe
-!redis/*.exe
-!interpreter/*.exe
-!windows_setup/*.exe
+windows_packages/
+windows_packages_cpu/
+windows_packages_gpu/
+redis/
+interpreter/
+windows_setup/
+sharedfiles/
 
 # Distribution / packaging
 .Python

diff --git a/README.md b/README.md
@@ -58,6 +58,8 @@ Visit [https://docs.deepstack.cc/getting-started](https://docs.deepstack.cc/gett
 - **Fetch Repo Files**
 
     ``git lfs pull``
+- **Download Binary Dependencies With Powershell**
+    ```.\download_dependencies.ps1```
 
 - **Build DeepStack Server**
 

diff --git a/deepstack-setup-cpu.iss b/deepstack-setup-cpu.iss
diff --git a/deepstack-setup-gpu.iss b/deepstack-setup-gpu.iss
diff --git a/download_dependencies.ps1 b/download_dependencies.ps1
@@ -0,0 +1,14 @@
+function Download($URL, $NAME){
+
+    (New-Object System.Net.WebClient).DownloadFile($URL, $NAME+".zip")
+    Expand-Archive -Path $NAME".zip" -Force
+    Remove-Item -Path $NAME".zip" -Force
+
+}
+
+Download -URL "https://deepstack.blob.core.windows.net/shared-files/sharedfiles.zip" -NAME "sharedfiles"
+Download -URL "https://deepstack.blob.core.windows.net/shared-files/interpreter.zip" -NAME "interpreter"
+Download -URL "https://deepstack.blob.core.windows.net/shared-files/redis.zip" -NAME "redis"
+Download -URL "https://deepstack.blob.core.windows.net/shared-files/windows_packages_cpu.zip" -NAME "windows_packages_cpu"
+Download -URL "https://deepstack.blob.core.windows.net/shared-files/windows_packages_gpu.zip" -NAME "windows_packages_gpu"
+Download -URL "https://deepstack.blob.core.windows.net/shared-files/windows_setup.zip" -NAME "windows_setup"
diff --git a/intelligencelayer/shared/shared.py b/intelligencelayer/shared/shared.py
@@ -102,4 +102,4 @@ class SharedOptions:
         ),
     }
 
-    SETTINGS = PROFILE_SETTINGS[PROFILE]
+    SETTINGS = PROFILE_SETTINGS[PROFILE]
diff --git a/interpreter/_asyncio.pyd b/interpreter/_asyncio.pyd
diff --git a/interpreter/_bz2.pyd b/interpreter/_bz2.pyd
diff --git a/interpreter/_ctypes.pyd b/interpreter/_ctypes.pyd
diff --git a/interpreter/_decimal.pyd b/interpreter/_decimal.pyd
diff --git a/interpreter/_elementtree.pyd b/interpreter/_elementtree.pyd
diff --git a/interpreter/_hashlib.pyd b/interpreter/_hashlib.pyd
diff --git a/interpreter/_lzma.pyd b/interpreter/_lzma.pyd
diff --git a/interpreter/_msi.pyd b/interpreter/_msi.pyd
diff --git a/interpreter/_multiprocessing.pyd b/interpreter/_multiprocessing.pyd
diff --git a/interpreter/_overlapped.pyd b/interpreter/_overlapped.pyd
diff --git a/interpreter/_queue.pyd b/interpreter/_queue.pyd
diff --git a/interpreter/_socket.pyd b/interpreter/_socket.pyd
diff --git a/interpreter/_sqlite3.pyd b/interpreter/_sqlite3.pyd
diff --git a/interpreter/_ssl.pyd b/interpreter/_ssl.pyd
diff --git a/interpreter/pyexpat.pyd b/interpreter/pyexpat.pyd
diff --git a/interpreter/select.pyd b/interpreter/select.pyd
diff --git a/interpreter/unicodedata.pyd b/interpreter/unicodedata.pyd
diff --git a/interpreter/winsound.pyd b/interpreter/winsound.pyd
diff --git a/server/server.go b/server/server.go
@@ -855,9 +855,9 @@ func main() {
 
 	getPort := os.Getenv("PORT")
 	intPortVal, err := strconv.Atoi(getPort)
-	if err != nil{
+	if err != nil {
 		flag.IntVar(&port, "PORT", 5000, "port")
-	}else{
+	} else {
 		flag.IntVar(&port, "PORT", intPortVal, "port")
 	}