procfunc 0.35.1__tar.gz → 0.36.1__tar.gz

{procfunc-0.35.1/src/procfunc.egg-info → procfunc-0.36.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: procfunc
-Version: 0.35.1
+Version: 0.36.1
 Summary: Function-Oriented Abstractions for Procedural 3D Generation in Python
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/princeton-vl/procfunc
@@ -37,7 +37,7 @@ Dynamic: license-file
 
 This repository contains only the Primitives API, Transpiler and Tracer from our research paper.
 
-The pre-made procedural generators are coming soon as part of [infinigen](https://github.com/princeton-vl/infinigen).
+Please see the infinigen2 [documentation](https://infinigen.cs.princeton.edu/docs/latest/) and [sourcecode](https://github.com/princeton-vl/infinigen/tree/3f58bb886bb1bda681d41240344fe3126ac0e9bd/src/infinigen2) to access the paper's library of new procedural generators
 
 ### Installation
 

{procfunc-0.35.1 → procfunc-0.36.1}/README.md

@@ -8,7 +8,7 @@
 
 This repository contains only the Primitives API, Transpiler and Tracer from our research paper.
 
-The pre-made procedural generators are coming soon as part of [infinigen](https://github.com/princeton-vl/infinigen).
+Please see the infinigen2 [documentation](https://infinigen.cs.princeton.edu/docs/latest/) and [sourcecode](https://github.com/princeton-vl/infinigen/tree/3f58bb886bb1bda681d41240344fe3126ac0e9bd/src/infinigen2) to access the paper's library of new procedural generators
 
 ### Installation
 

{procfunc-0.35.1 → procfunc-0.36.1}/pyproject.toml

@@ -52,6 +52,7 @@ procfunc = ["nodes/manifest.json", "ops/manifest.json"]
 
 [tool.pytest.ini_options]
 testpaths = "tests"
+markers = ["render: requires a render-capable Blender environment"]
 
 [tool.ruff]
 exclude = ["examples", "experiments"]

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/__init__.py

@@ -2,7 +2,7 @@
 # ensure this gets imported first so that mathutils etc is available even if later modules dont import bpy
 import bpy
 
-__version__ = "0.35.1"
+__version__ = "0.36.1"
 
 from numpy.random import Generator as RNG
 
@@ -54,6 +54,7 @@ from .nodes import ProcNode, Shader, NodeDataType
 from .tracer import trace, autowrap_module, add_search_scope
 from .util.manifest import module_path
 
+bpy.context.preferences.edit.use_global_undo = False
 autowrap_module(random)
 autowrap_module(color)
 add_search_scope(nodes)

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/codegen/codegen.py

@@ -240,9 +240,12 @@ def _operator_call_operands(
 
     operands = [bound.arguments[name] for name in operand_names]
 
-    # a default epsilon stays tolerant unlike exact ==/!=, so require exact operands
-    if template in _EPSILON_EQUALITY_TEMPLATES and not all(
-        _is_exact_compare_operand(v) for v in operands
+    operator_type = FUNCTIONS_TO_OPERATORS.get(node.func)
+    native_equality = operator_type in (OperatorType.EQUAL, OperatorType.NOT_EQUAL)
+    if (
+        template in _EPSILON_EQUALITY_TEMPLATES
+        and not native_equality
+        and not all(_is_exact_compare_operand(v) for v in operands)
     ):
         return None
 
@@ -603,7 +606,8 @@ def _codegen_for_assignment(
 def _expressions_scope_for_graph(
     graph: cg.ComputeGraph,
     scope_expressions: dict[int, str | list[str]],
-) -> tuple[dict[int, str | list[str]], dict[int, bool]]:
+    fold_map: dict[int, bool],
+) -> dict[int, str | list[str]]:
     expressions: dict[int, str | list[str]] = {
         **scope_expressions.copy(),
         **_check_graph_input_names(graph, scope_expressions),
@@ -612,9 +616,6 @@ def _expressions_scope_for_graph(
     # when we want to refer to a value, what string should we insert?
     # - for most nodes: refer to a variable name
     # - for inlined expressions: emplace a expression string
-    usages = cg.usages_per_node(graph)
-    fold_map = _expression_fold_map(graph, expressions, usages=usages)
-
     node_names = identifiers.nodenames_from_fixed_and_infill(
         graph,
         fold_map=fold_map,
@@ -627,7 +628,7 @@ def _expressions_scope_for_graph(
         raise ValueError(f"Scope and node names had overlap: {intersection=}")
     expressions.update(node_names)
 
-    return expressions, fold_map
+    return expressions
 
 
 def _codegen_for_graph(
@@ -643,17 +644,13 @@ def _codegen_for_graph(
     if add_version_comment:
         code_lines.append(f"# Code generated by procfunc v{pf.__version__}")
 
-    expressions, fold_map = _expressions_scope_for_graph(graph, scope_expressions)
+    usages = cg.usages_per_node(graph)
+    fold_map = _expression_fold_map(graph, scope_expressions, usages)
+    expressions = _expressions_scope_for_graph(graph, scope_expressions, fold_map)
     _input_ids = set(id(node) for node in graph.inputs.values())  # noqa: F841
-
+    output_ids = {id(node) for node in graph.outputs.values()}
     last_varname: str = ""
 
-    # Collect mutator call nodes so they emit as bare statements (no assignment)
-    mutator_call_ids = set()
-    for node in cg.traverse_depth_first(graph):
-        if isinstance(node, cg.MutatedArgumentNode):
-            mutator_call_ids.add(id(node.args[1]))
-
     for node in cg.traverse_depth_first(graph):
         if isinstance(node, cg.InputPlaceholderNode):
             continue  # arguments are defined in _codegen_graph_inputs
@@ -670,7 +667,17 @@ def _codegen_for_graph(
             expressions[id(node)] = node_code
             continue
 
-        if id(node) in mutator_call_ids:
+        node_usages = usages.get(id(node), [])
+        mutation_usages = [
+            usage
+            for usage in node_usages
+            if isinstance(usage, cg.MutatedArgumentNode) and usage.args[1] is node
+        ]
+        if (
+            mutation_usages
+            and mutation_usages == node_usages
+            and id(node) not in output_ids
+        ):
             code_lines.extend(node_code if isinstance(node_code, list) else [node_code])
             continue
 
@@ -713,6 +720,8 @@ def _resolve_func(func: Any) -> tuple[str | None, str]:
         raise NotImplementedError(f"Unsupported function: {func}")
     elif module == "builtins":
         return None, func.__name__
+    elif module == "_operator":
+        return "import operator", f"operator.{func.__name__}"
     elif module.startswith("procfunc."):
         callsite = "pf." + module[len("procfunc.") :] + "." + func.__name__
         importstring = "import procfunc as pf"

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/codegen/repr.py

@@ -27,7 +27,8 @@ def repr_type(x: Any) -> str:
     if origin is Union or origin is types.UnionType:
         first_args = get_args(args[0])
         if (
-            get_origin(args[0]) is nt.ProcNode
+            len(args) == 2
+            and get_origin(args[0]) is nt.ProcNode
             and first_args
             and first_args[0] is args[1]
         ):
@@ -82,6 +83,8 @@ def repr_value(value: Any) -> str:
 
     if isinstance(value, np.random.Generator):
         return "np.random.default_rng()"
+    elif get_origin(value) in (Union, types.UnionType, nt.ProcNode):
+        return repr_type(value)
     elif isinstance(value, type):
         return repr_type(value)
     elif isinstance(value, np.ndarray):

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/compute_graph/operators_info.py

@@ -7,6 +7,7 @@ class OperatorType(Enum):
     SUB = "sub"
     MUL = "mul"
     DIV = "div"
+    FLOOR_DIV = "floordiv"
     TRUEDIV = "truediv"
     POW = "pow"
     MOD = "mod"
@@ -17,6 +18,8 @@ class OperatorType(Enum):
     EQUAL = "eq"
     NOT_EQUAL = "ne"
     NOT = "invert"
+    NEG = "neg"
+    POS = "pos"
     LSHIFT = "lshift"
     RSHIFT = "rshift"
     BIT_AND = "and"
@@ -34,6 +37,7 @@ OPERATOR_TEMPLATES = {
     OperatorType.SUB: "{} - {}",
     OperatorType.MUL: "{} * {}",
     OperatorType.DIV: "{} / {}",
+    OperatorType.FLOOR_DIV: "{} // {}",
     OperatorType.POW: "{} ** {}",
     OperatorType.MOD: "{} % {}",
     OperatorType.LESS_THAN: "{} < {}",
@@ -42,6 +46,9 @@ OPERATOR_TEMPLATES = {
     OperatorType.GREATER_THAN_EQUAL: "{} >= {}",
     OperatorType.EQUAL: "{} == {}",
     OperatorType.NOT_EQUAL: "{} != {}",
+    OperatorType.NOT: "~{}",
+    OperatorType.NEG: "-{}",
+    OperatorType.POS: "+{}",
     OperatorType.VECTOR_PACK: "({}, {}, {})",
     OperatorType.NOOP: "{}",
     OperatorType.LSHIFT: "{} << {}",
@@ -57,6 +64,7 @@ OPERATORS_TO_FUNCTIONS = {
     OperatorType.SUB: operator.sub,
     OperatorType.MUL: operator.mul,
     OperatorType.DIV: operator.truediv,
+    OperatorType.FLOOR_DIV: operator.floordiv,
     OperatorType.MOD: operator.mod,
     OperatorType.POW: operator.pow,
     OperatorType.LESS_THAN: operator.lt,
@@ -65,6 +73,9 @@ OPERATORS_TO_FUNCTIONS = {
     OperatorType.GREATER_THAN_EQUAL: operator.ge,
     OperatorType.EQUAL: operator.eq,
     OperatorType.NOT_EQUAL: operator.ne,
+    OperatorType.NOT: operator.invert,
+    OperatorType.NEG: operator.neg,
+    OperatorType.POS: operator.pos,
     OperatorType.LSHIFT: operator.lshift,
     OperatorType.RSHIFT: operator.rshift,
     OperatorType.BIT_AND: operator.and_,
@@ -80,6 +91,7 @@ REFLECTABLE_OPERATORS = {
     OperatorType.SUB,
     OperatorType.MUL,
     OperatorType.DIV,
+    OperatorType.FLOOR_DIV,
     OperatorType.MOD,
     OperatorType.POW,
     OperatorType.LSHIFT,

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/context.py

@@ -19,6 +19,14 @@ class ProcfuncContext:
     'ignore' silently returns an empty mesh, 'warn' logs a warning, 'throw' raises an error.
     """
 
+    warn_mode_transpile_dropped_attrs: Literal["ignore", "warn", "throw"]
+    """
+    Controls behavior when transpiling a bpy node whose attributes carry render-affecting
+    state procfunc has no binding for, so the transpiled result would render differently
+    (e.g. a non-identity texture_mapping on a ShaderNodeTex* node).
+    'ignore' drops it silently, 'warn' logs a warning, 'throw' raises an error.
+    """
+
     record_node_definitions: bool = False
     """
     Record the user-space file/line/function that constructed each ProcNode, used only to
@@ -34,10 +42,12 @@ class ProcfuncContext:
     def set_strict(self):
         """Set all warning modes to 'throw'"""
         self.warn_mode_empty_geonodes = "throw"
+        self.warn_mode_transpile_dropped_attrs = "throw"
 
     def set_warn(self):
         """Set all warning modes to 'warn'"""
         self.warn_mode_empty_geonodes = "warn"
+        self.warn_mode_transpile_dropped_attrs = "warn"
 
 
 # Global context instance
@@ -47,9 +57,15 @@ warn_modes = ["ignore", "warn", "throw"]
 _warn_mode_empty_geonodes = os.environ.get("PROCFUNC_WARN_MODE_EMPTY_GEONODES", "warn")
 assert _warn_mode_empty_geonodes in warn_modes
 
+_warn_mode_transpile_dropped_attrs = os.environ.get(
+    "PROCFUNC_WARN_MODE_TRANSPILE_DROPPED_ATTRS", "throw"
+)
+assert _warn_mode_transpile_dropped_attrs in warn_modes
+
 globals = ProcfuncContext(
     num_cpu_cores=int(os.environ.get("PROCFUNC_NUM_CPU_CORES", 0)),
     warn_mode_empty_geonodes=_warn_mode_empty_geonodes,  # type: ignore[invalid-assignment]
+    warn_mode_transpile_dropped_attrs=_warn_mode_transpile_dropped_attrs,  # type: ignore[invalid-assignment]
     current_trace_level=None,
     record_node_definitions=os.environ.get("PROCFUNC_RECORD_NODE_DEFINITIONS", "0")
     == "1",

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/control/__init__.py

@@ -33,6 +33,7 @@ def choice_idx(rng: np.random.Generator, weights: list[float]) -> int:
 def _peekthrough_execute_all_choices(
     choice_options: list[tuple[Callable[..., T], float]],
     chosen_idx: int,
+    choice_rng: cg.Node,
     args: tuple,
     kwargs: dict,
 ) -> cg.Proxy:
@@ -43,6 +44,7 @@ def _peekthrough_execute_all_choices(
         evald.append((res, weight))
 
     new_kwargs = dict(
+        choice_rng=choice_rng,
         choice_options=evald,
         chosen_idx=chosen_idx,
     )
@@ -67,6 +69,7 @@ class ChoiceResultProxy(cg.Proxy):
             return _peekthrough_execute_all_choices(
                 self.node.kwargs["choice_options"],
                 self.node.kwargs["chosen_idx"],
+                self.node.kwargs["choice_rng"],
                 args,
                 kwargs,
             )
@@ -92,13 +95,16 @@ def _choice_create_custom_tracer_wrapper(
     @functools.wraps(choice)
     def wrapper(
         choice_rng: RngProxy,
-        choice_options: list[tuple[T, float]] | None = None,
+        choice_options: list[tuple[T, float]],
         chosen_idx: int | None = None,
     ):
         choice_values, choice_weights = zip(*choice_options)
         if chosen_idx is None:
             chosen_idx = choice_idx(choice_rng.rng, choice_weights)
 
+        if patcher.trace_level < TraceLevel.RANDOM_CONTROL:
+            return choice_values[chosen_idx]
+
         unwrapped_options = [
             (pytree.PyTree(v).map(_unwrap_proxy).obj(), w) for v, w in choice_options
         ]

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/nodes/__init__.py

@@ -28,6 +28,7 @@ from .execute.execute import (
 )
 from .execute.util import NODE_OPERATOR_TABLE
 from .types import (
+    HandleType,
     ProcNode,
     Shader,
     SocketOrVal,
@@ -51,6 +52,7 @@ __all__ = [
     "ProcNode",
     "Shader",
     "SocketOrVal",
+    "HandleType",
     "NodeDataType",
     "NodeGroupType",
     "SocketType",

{procfunc-0.35.1 → procfunc-0.36.1}/src/procfunc/nodes/color.py

@@ -61,16 +61,31 @@ def rgb_curve(
     fac: nt.SocketOrVal[float],
     color: nt.SocketOrVal[pt.Color],
     curves: list[np.ndarray] | np.ndarray | None = None,
+    handle_types: list[list[nt.HandleType]] | None = None,
+    use_clip: bool = True,
+    extend: Literal["HORIZONTAL", "EXTRAPOLATED"] = "EXTRAPOLATED",
+    clip_min: tuple[float, float] | None = None,
+    clip_max: tuple[float, float] | None = None,
 ) -> nt.ProcNode:
     """
     Uses a RGBCurve Shader Node.
 
+    `handle_types[i]` contains the handles for the i-th curve, and
+    `handle_types[i][j]` is the handle type for `curves[i][j]`.
+
     See: https://docs.blender.org/manual/en/4.2/render/shader_nodes/color/rgb_curves.html
     """
     return nt.ProcNode.from_nodetype(
         node_type="ShaderNodeRGBCurve",
         inputs={"Fac": fac, "Color": color},
-        attrs={"curves": curves},
+        attrs={
+            "curves": curves,
+            "handle_types": handle_types,
+            "use_clip": use_clip,
+            "extend": extend,
+            "clip_min": clip_min,
+            "clip_max": clip_max,
+        },
     )