summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryum <yum.food.vr@gmail.com>2024-03-04 15:36:46 -0800
committeryum <yum.food.vr@gmail.com>2024-03-04 15:36:48 -0800
commitdb8618577175a5f6031b0002d269a2535a71a818 (patch)
treeb94bfa6ae4ff3f9212a0ed5ced39e3c9b866349c
parent809082bd3ab05b364da6273e69de3755387c8b4b (diff)
Begin fixing build on new hosts
Google drive intentionally broke CLI downloads ("don't be evil") and UwwwuPP went away. Begin work rehosting both files.
-rw-r--r--GUI/README.md4
-rw-r--r--GUI/package.ps118
-rw-r--r--UnityAssets/Materials/TaSTT_Text.mat2
3 files changed, 12 insertions, 12 deletions
diff --git a/GUI/README.md b/GUI/README.md
index ff3e358..39d3292 100644
--- a/GUI/README.md
+++ b/GUI/README.md
@@ -13,7 +13,7 @@
$ git submodule init
$ git submodule update
```
-3. Execute Libraries/fetch.ps1. This will take 10-20 minutes.
+3. Execute Libraries/fetch.ps1. This will take 2-3 minutes.
3.0. If you can't run the script, run `Set-ExecutionPolicyPolicy
Unrestricted` in an admin instance of powershell. Heed the warning,
this is a security risk! Never run code from someone you don't trust
@@ -26,7 +26,7 @@ $ git submodule update
7. Build x64/Release.
1. The build configuration is in the top. By default it's probably Debug/x64.
2. To build: ctrl+shift+B
- 3. If you saw an error in 3.1, rerun Libraries/fetch.ps1.
+ 3. If you saw an error in 7.1, rerun Libraries/fetch.ps1.
8. Open GUI/GUI.sln with Visual Studio 2022.
9. Build x64/Release.
10. Run package.ps1 from powershell.
diff --git a/GUI/package.ps1 b/GUI/package.ps1
index e1f447b..f91af27 100644
--- a/GUI/package.ps1
+++ b/GUI/package.ps1
@@ -100,26 +100,26 @@ if (-Not (Test-Path $nvidia_dir)) {
# pain in the dick for end users to download, so I rehosted them.
# TODO check hashes.
echo "Fetching NVIDIA dll 1/4 (600MB)"
- $CUDNN_CNN_INFER_URL = "https://drive.google.com/uc?export=download&confirm=yes&id=1Px7SGEOM8uAJNxxMGBSwo4sEE8H7GzkB"
- Invoke-WebRequest $CUDNN_CNN_INFER_URL -OutFile "cudnn_cnn_infer64_8.dll"
+ $CUDNN_1_URL = "https://www.dropbox.com/scl/fi/7vgnqz732lmrdkbktc0tm/cublas64_11.dll?rlkey=ju4fjpf8v9aoopdeqddfkcrfj&dl=0"
+ Invoke-WebRequest $CUDNN_1_URL -OutFile "cublas64_11.dll"
echo "Fetching NVIDIA dll 2/4 (80MB)"
- $CUDNN_OPS_INFER_URL = "https://drive.google.com/uc?export=download&confirm=yes&id=1mw6Ds1x-4G_GtSzM-GM8y27E9vpQRi_P"
- Invoke-WebRequest $CUDNN_OPS_INFER_URL -OutFile "cudnn_ops_infer64_8.dll"
+ $CUDNN_2_URL = "https://www.dropbox.com/scl/fi/xgz2rbp5gxy1v6o0t5e4r/cublasLt64_11.dll?rlkey=l6uk24q82anmjtlr39m8pbftb&dl=0"
+ Invoke-WebRequest $CUDNN_2_URL -OutFile "cublasLt64_11.dll"
echo "Fetching NVIDIA dll 3/4 (80MB)"
- $CUBLAS_64_DLL = "https://drive.google.com/uc?export=download&confirm=yes&id=1bflxDt83inYM0N2N0ebD1tw0Jh9la33R"
- Invoke-WebRequest $CUBLAS_64_DLL -OutFile "cublas64_11.dll"
+ $CUDNN_3_URL = "https://www.dropbox.com/scl/fi/ffy0i5l5asrfkiesr3t1u/cudnn_cnn_infer64_8.dll?rlkey=t2v0v6y78tq2h2i5y0bmm7n0z&dl=0"
+ Invoke-WebRequest $CUDNN_3_URL -OutFile "cudnn_cnn_infer64_8.dll"
echo "Fetching NVIDIA dll 4/4 (150MB)"
- $CUBLAS_LT64_DLL = "https://drive.google.com/uc?export=download&confirm=yes&id=1fQuVgpkbI8tNPTwueEeiLCSDzqSSGldI"
- Invoke-WebRequest $CUBLAS_Lt64_DLL -OutFile "cublasLt64_11.dll"
+ $CUDNN_4_URL = "https://www.dropbox.com/scl/fi/dd1t62wc5gtz5bmhji01h/cudnn_ops_infer64_8.dll?rlkey=b11q8h3f97pxsamak04z4f84d&dl=0"
+ Invoke-WebRequest $CUDNN_4_URL -OutFile "cudnn_ops_infer64_8.dll"
popd > $null
}
if (-Not (Test-Path UwwwuPP)) {
- git clone https://github.com/Leonetienne/UwwwuPP
+ git clone https://github.com/yum-food/UwwwuPP
pushd UwwwuPP > $null
git submodule update --init --recursive
diff --git a/UnityAssets/Materials/TaSTT_Text.mat b/UnityAssets/Materials/TaSTT_Text.mat
index 3e28c5a..be8ee90 100644
--- a/UnityAssets/Materials/TaSTT_Text.mat
+++ b/UnityAssets/Materials/TaSTT_Text.mat
@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: TaSTT_Chatbox
+ m_Name: TaSTT_Text
m_Shader: {fileID: 4800000, guid: feba055fa9e7f9543aaae032a30ec878, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4