Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Joolafen/windows fix #118

Merged
merged 5 commits into from
Oct 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
*.pt filter=lfs diff=lfs merge=lfs -text
*.model filter=lfs diff=lfs merge=lfs -text
7 changes: 6 additions & 1 deletion .github/workflows/pr_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 7 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**

Expand Down
97 changes: 0 additions & 97 deletions deepstack-setup-cpu.iss

This file was deleted.

97 changes: 0 additions & 97 deletions deepstack-setup-gpu.iss

This file was deleted.

14 changes: 14 additions & 0 deletions download_dependencies.ps1
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion intelligencelayer/shared/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ class SharedOptions:
),
}

SETTINGS = PROFILE_SETTINGS[PROFILE]
SETTINGS = PROFILE_SETTINGS[PROFILE]
Binary file added interpreter/_asyncio.pyd
Binary file not shown.
Binary file added interpreter/_bz2.pyd
Binary file not shown.
Binary file added interpreter/_ctypes.pyd
Binary file not shown.
Binary file added interpreter/_decimal.pyd
Binary file not shown.
Binary file added interpreter/_elementtree.pyd
Binary file not shown.
Binary file added interpreter/_hashlib.pyd
Binary file not shown.
Binary file added interpreter/_lzma.pyd
Binary file not shown.
Binary file added interpreter/_msi.pyd
Binary file not shown.
Binary file added interpreter/_multiprocessing.pyd
Binary file not shown.
Binary file added interpreter/_overlapped.pyd
Binary file not shown.
Binary file added interpreter/_queue.pyd
Binary file not shown.
Binary file added interpreter/_socket.pyd
Binary file not shown.
Binary file added interpreter/_sqlite3.pyd
Binary file not shown.
Binary file added interpreter/_ssl.pyd
Binary file not shown.
Binary file added interpreter/pyexpat.pyd
Binary file not shown.
Binary file added interpreter/select.pyd
Binary file not shown.
Binary file added interpreter/unicodedata.pyd
Binary file not shown.
Binary file added interpreter/winsound.pyd
Binary file not shown.
4 changes: 2 additions & 2 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
Loading