Skip to content

Init nix flake #167

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.

Sign up for GitHub

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

Open
the-furry-hubofeverything wants to merge 1 commit into
base: main
Choose a base branch
from
+574 −0
Open

Init nix flake #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,10 @@ Build/godot.zip
Build/godot_templates.tpz

Saved/*

# Ignore build outputs from performing a nix-build or `nix build` command
result
result-*

# Ignore automatically generated direnv output
.direnv
61 changes: 61 additions & 0 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.self.submodules = true;

outputs = {
nixpkgs,
flake-utils,
...
}:
flake-utils.lib.eachSystem [
"x86_64-linux"
] (
system: let
pkgs = nixpkgs.legacyPackages.${system};

# Matches semver compliant versioning in project.godot
regex = ".+config\/version=\"([[:alnum:]]+\.[[:alnum:]]+\.[[:alnum:]]-{0,1}[[:alnum:]]*+{0,1}[[:alnum:]]*)\".+";
in {
formatter.${system} = pkgs.alejandra;
packages.default = pkgs.callPackage ./nix/package.nix {version = builtins.head (builtins.match regex (builtins.readFile ./project.godot));};
packages.mediapipe = pkgs.callPackage ./nix/mediapipe.nix {};
}
);
}
13 changes: 13 additions & 0 deletions nix/config-home-dir.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/Core/Main.gd b/Core/Main.gd
index 37c7a00..89c100f 100644
--- a/Core/Main.gd
+++ b/Core/Main.gd
@@ -740,7 +740,7 @@ func get_controller():
static func get_saved_location() -> String:
if OS.has_feature("editor"):
return "res://Saved"
- return OS.get_executable_path().get_base_dir().path_join("Saved")
+ return OS.get_config_dir().path_join("snekstudio")

## Get the config directory. Will default to the user data directory unless
## overridden by environment variable.
106 changes: 106 additions & 0 deletions nix/deref-pycache.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
diff --git a/addons/KiriPythonRPCWrapper/KiriPythonWrapperInstance.gd b/addons/KiriPythonRPCWrapper/KiriPythonWrapperInstance.gd
index 4f7943c..082648f 100644
--- a/addons/KiriPythonRPCWrapper/KiriPythonWrapperInstance.gd
+++ b/addons/KiriPythonRPCWrapper/KiriPythonWrapperInstance.gd
@@ -66,18 +66,9 @@ func setup_python(force_unpack_extras : bool = false):
# Determine if we need to purge the cache based on what we're expecting to
# see version-wise vs what's actually represented there.
var needs_purge : bool = false
- var platform_status = _build_wrangler._get_platform_status()
+ # var platform_status = _build_wrangler._get_platform_status()
var cache_status = _build_wrangler.get_cache_status()
if cache_status.has("requirements_installed"):
- if cache_status["requirements_installed"] != platform_status["requirements"]:
- # Has the requirements field, and it's changed since we installed
- # last.
- needs_purge = true
- else:
- pass # No purge. Everything matches.
- else:
- # Doesn't have the requirements field. Possible indicator of a partial
- # install.
needs_purge = true

# If we're running a build, let's see if the build's packaged version
@@ -94,22 +85,12 @@ func setup_python(force_unpack_extras : bool = false):
# No hash marker at all? Purge it just to be safe.
needs_purge = true

- # Purge it if needed.
- if needs_purge:
- _build_wrangler.purge_cached_python()
-
- # Unpack base Python build.
- if _build_wrangler.unpack_python() == false:
- OS.alert("Unpacking Python failed!")
- return false
-
# Determine if we need to install whl files and unpack wrapper scripts.
var needs_setup = true
- platform_status = _build_wrangler._get_platform_status()
+ # platform_status = _build_wrangler._get_platform_status()
cache_status = _build_wrangler.get_cache_status()
if cache_status.has("requirements_installed"):
- if cache_status["requirements_installed"] == platform_status["requirements"]:
- needs_setup = false
+ needs_setup = false

# Unpack Python wrapper, whl files, and project-specific scripts.
if needs_setup or force_unpack_extras or data_hash == null:
@@ -132,51 +113,15 @@ func setup_python(force_unpack_extras : bool = false):
var bytes : PackedByteArray = FileAccess.get_file_as_bytes(extra_script)
FileAccess.open(extraction_path, FileAccess.WRITE).store_buffer(bytes)

- # Run pip to install packages from .whl files.
- var successfully_ran_pip_setup : bool = false
- if needs_setup:
-
- # Get a list of all the wheel files.
- var wheels_path : String = _build_wrangler._get_cache_path_godot().path_join("packaged_scripts/addons/KiriPythonRPCWrapper/Wheels")
- if DirAccess.dir_exists_absolute(wheels_path):
- var platform_wheels_path = wheels_path.path_join(KiriPythonBuildWrangler.get_host_os_name())
- var wheel_list : PackedStringArray = DirAccess.get_files_at(platform_wheels_path)
-
- if len(wheel_list):
-
- var pip_args : PackedStringArray = [
- "-m", "pip", "install",
- ]
-
- # Add every wheel file in the directory as an argument.
- for wheel in wheel_list:
- if wheel.ends_with(".whl"):
- pip_args.append(ProjectSettings.globalize_path(platform_wheels_path.path_join(wheel)))
-
- # Run pip.
- var output : Array = []
- var pip_result = execute_python(pip_args, output, true, false)
- if pip_result != 0:
- OS.alert("Pip installation failed!\n" + "\n".join(output))
- return false
-
- successfully_ran_pip_setup = true
-
- else:
- print("No wheel files detected. Skipping pip install.")
- else:
- print("Wheel directory does not exist. Skipping pip install.")
-
# FIXME: Delete wheel files? I don't think we need them anymore. If we made
# it this far, then we know we succeeded at the install.

# Write success marker.
- if successfully_ran_pip_setup:
- cache_status = _build_wrangler.get_cache_status()
- cache_status["requirements_installed"] = platform_status["requirements"]
- if data_hash != null:
- cache_status["extra_data_hash"] = data_hash
- _build_wrangler.write_cache_status(cache_status)
+ cache_status = _build_wrangler.get_cache_status()
+ cache_status["requirements_installed"] = true
+ if data_hash != null:
+ cache_status["extra_data_hash"] = data_hash
+ _build_wrangler.write_cache_status(cache_status)

return true

31 changes: 31 additions & 0 deletions nix/embed-pck.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/export_presets.cfg b/export_presets.cfg
index 1755037..83510c7 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -21,7 +21,7 @@ script_export_mode=2
custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=1
-binary_format/embed_pck=false
+binary_format/embed_pck=true
texture_format/s3tc_bptc=true
texture_format/etc2_astc=false
binary_format/architecture="x86_64"
@@ -66,7 +66,7 @@ script_export_mode=2
custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=1
-binary_format/embed_pck=false
+binary_format/embed_pck=true
texture_format/s3tc_bptc=true
texture_format/etc2_astc=true
binary_format/architecture="arm64"
@@ -106,7 +106,7 @@ script_export_mode=2
custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=1
-binary_format/embed_pck=false
+binary_format/embed_pck=true
texture_format/s3tc_bptc=true
texture_format/etc2_astc=false
binary_format/architecture="x86_64"
103 changes: 103 additions & 0 deletions nix/mediapipe-queue-mutex-delete.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
diff --git a/Mods/MediaPipe/_tracker/Project/new_tracker.py b/Mods/MediaPipe/_tracker/Project/new_tracker.py
index 4bb067a..e210f44 100644
--- a/Mods/MediaPipe/_tracker/Project/new_tracker.py
+++ b/Mods/MediaPipe/_tracker/Project/new_tracker.py
@@ -37,9 +37,6 @@ class MediaPipeTracker:
# We need these to avoid deadlocks. If we're queueing frames
# faster than they can process, we'll hit a deadlock in
# MediaPipe.
- self.frames_queued_face = 0
- self.frames_queued_hands = 0
- self.frames_queued_mutex = threading.Lock()
self.should_quit_threads = False

# Open the socket immediately so we can start sending error
@@ -242,9 +239,6 @@ class MediaPipeTracker:
# move it into Godot.
self.last_blendshapes[shape.category_name] = shape.score # normalized

- with self.frames_queued_mutex:
- self.frames_queued_face -= 1
-
# FIXME: If we ever come back to it, finish this.
def _handle_result_pose(
self,
@@ -261,9 +255,6 @@ class MediaPipeTracker:
# self._write_log("HAND RESULTS: ", timestamp_ms)
# return

- with self.frames_queued_mutex:
- self.frames_queued_hands -= 1
-
# Check if hand count changed. Pause tracking for a moment if we
# did.
if self.last_hand_count != len(result.hand_landmarks):
@@ -549,28 +540,8 @@ class MediaPipeTracker:
if this_time <= last_timestamp_used:
continue

- # Check to see if we have too many face tracking
- # frames queued.
- need_reset = False
- with self.frames_queued_mutex:
- if self.frames_queued_face > 5:
- need_reset = True
- else:
- self.frames_queued_face += 1
-
- # This will get reset immediately if we detect
- # a face. Otherwise it'll be how many frames
- # since the last face detection.
self.time_since_last_face_detection += 1.0
-
- # Reset if we have too face frames queued. Avoid a
- # deadlock.
- if need_reset:
- # Deadlock-avoidance.
- self.landmarker._runner.restart()
- self.frames_queued_face = 0
- else:
- self.landmarker.detect_async(mp_image, this_time)
+ self.landmarker.detect_async(mp_image, this_time)

# Hands

@@ -585,23 +556,8 @@ class MediaPipeTracker:
if hand_landmarker_time_skew > 50: # FIXME: Make configurable (milliseconds)
self._last_hand_result_timestamp += this_time - self._last_hand_detect_timestamp
else:
- # Check to see if we have too many hand tracking
- # frames queued.
- need_reset = False
- with self.frames_queued_mutex:
- if self.frames_queued_face > 5:
- need_reset = True
- else:
- self.frames_queued_hands += 1
-
- # If we do have too many frames queued, just reset
- # the tracker to avoid a deadlock.
- if need_reset:
- self.landmarker_hands._runner.restart()
- self.frames_queued_hands = 0
- else:
- self.landmarker_hands.detect_async(mp_image, this_time)
- self._last_hand_detect_timestamp = this_time
+ self.landmarker_hands.detect_async(mp_image, this_time)
+ self._last_hand_detect_timestamp = this_time

# Track the last timestamp because we have to keep
# these monotonically increasing and we can't send
@@ -644,12 +600,6 @@ class MediaPipeTracker:

output_data_json = json.dumps(output_data, indent=4).encode("utf-8")

- with self.frames_queued_mutex:
- status_packet_str = "Tracking data sending. (Queue: %2d hand, %2d face)" % (self.frames_queued_hands, self.frames_queued_face)
-
- # FIXME: This is too spammy.
- # self._write_log(status_packet_str)
-
# Output the packet.
if self.video_device_capture:
self._udp_socket.sendto(output_data_json, ("127.0.0.1", self.udp_port_number))
Loading