Improve neml2 setup script to look for a pytorch installation

conda/moose-dev/meta.yaml

@@ -2,7 +2,7 @@
 # REMEMBER TO UPDATE the .yaml files for the following packages:
 #   moose/conda_build_config.yaml
 # As well as any directions pertaining to modifying those files.
-{% set version = "2026.02.17" %}
+{% set version = "2026.02.19" %}
 
 package:
   name: moose-dev

conda/moose/conda_build_config.yaml

@@ -2,7 +2,7 @@ mpi:
   - mpich
 
 moose_dev:
-  - moose-dev 2026.02.17
+  - moose-dev 2026.02.19
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

framework/contrib/neml2.mk

@@ -3,13 +3,7 @@
 ################################################################################
 ifeq ($(ENABLE_NEML2),true)
 
-# Dynamic library suffix
-DYLIB_SUFFIX := so
-ifeq ($(shell uname -s),Darwin)
-DYLIB_SUFFIX := dylib
-endif
-
-# NEML2 libraries are suffixed with the CMake build type
+# NEML2 libraries and pkgconfig are suffixed with the CMake build type
 ifeq ($(METHOD),devel)
 NEML2_SUFFIX := _RelWithDebInfo
 else ifeq ($(METHOD),oprof)
@@ -18,36 +12,24 @@ else ifeq ($(METHOD),dbg)
 NEML2_SUFFIX := _Debug
 endif
 
-# NEML2 directories and libraries
-NEML2_INCLUDE    := $(NEML2_DIR)/include
-# If we can ever consistently get NEML2 to install its libs in
-# the same directory, we can get rid of this
-ifneq ($(wildcard $(NEML2_DIR)/lib/.),)
-NEML2_LIB_DIR 	 := $(NEML2_DIR)/lib
-else
-$(error Failed to find NEML2 libraries in $(NEML2_DIR)/lib)
+# NEML2 pkgconfig file
+NEML2_PC := $(NEML2_DIR)/share/pkgconfig/neml2$(NEML2_SUFFIX).pc
+ifeq ($(wildcard $(NEML2_PC)),)
+$(error NEML2 pkgconfig file not found: $(NEML2_PC))
 endif
-NEML2_LIBS       := neml2${NEML2_SUFFIX} \
-										neml2_base$(NEML2_SUFFIX) \
-									  neml2_dispatcher$(NEML2_SUFFIX) \
-										neml2_driver$(NEML2_SUFFIX) \
-										neml2_misc$(NEML2_SUFFIX) \
-										neml2_model$(NEML2_SUFFIX) \
-										neml2_solver$(NEML2_SUFFIX) \
-										neml2_tensor$(NEML2_SUFFIX) \
-										neml2_user_tensor$(NEML2_SUFFIX)
-NEML2_LIBS       := $(addprefix -l,$(NEML2_LIBS))
-NEML2_LIB_FILES  := $(addprefix $(NEML2_LIB_DIR)/lib,$(addsuffix .$(DYLIB_SUFFIX),$(NEML2_LIBS)))
 
-# Compile flags for NEML2
-neml2_INCLUDES    += $(addprefix -iquote,$(NEML2_INCLUDE))
-neml2_CPPFLAGS    += -DNEML2_ENABLED
-neml2_LDFLAGS     += -Wl,-rpath,$(NEML2_LIB_DIR) -L$(NEML2_LIB_DIR)
-neml2_LIBS        += $(NEML2_LIBS)
-libmesh_CXXFLAGS  += $(neml2_CPPFLAGS)
-libmesh_INCLUDE   += $(neml2_INCLUDES)
-libmesh_LDFLAGS   += $(neml2_LDFLAGS)
-libmesh_LIBS      += $(neml2_LIBS)
+# NEML2 flags
+comma := ,
+neml2_CPPFLAGS += -DNEML2_ENABLED
+neml2_INCLUDES += $(shell pkg-config --cflags $(NEML2_PC))
+neml2_LDFLAGS  += $(foreach libdir,$(shell pkg-config --libs-only-L $(NEML2_PC)),$(patsubst -L%,-Wl$(comma)-rpath$(comma)%,$(libdir)))
+neml2_LIBS     += $(shell pkg-config --libs $(NEML2_PC))
+
+# Append to libmesh flags
+libmesh_CXXFLAGS += $(neml2_CPPFLAGS) # I think MOOSE Makefiles tend to abuse libmesh_CXXFLAGS for preprocessor flags
+libmesh_INCLUDE  += $(neml2_INCLUDES)
+libmesh_LDFLAGS  += $(neml2_LDFLAGS)
+libmesh_LIBS     += $(neml2_LIBS)
 
 endif
 

modules/solid_mechanics/test/tests/neml2/crystal_plasticity/approx_kinematics_neml2.i

@@ -13,13 +13,6 @@
   []
 []
 
-[Solvers]
-  [newton]
-    type = NewtonWithLineSearch
-    max_linesearch_iterations = 5
-  []
-[]
-
 [Data]
   [crystal_geometry]
     type = CubicCrystal
@@ -102,17 +95,37 @@
     type = WR2ImplicitExponentialTimeIntegration
     variable = 'state/orientation'
   []
-
   [implicit_rate]
     type = ComposedModel
     models = "spatial_velocity_gradient split_to_deformation_rate split_to_vorticity euler_rodrigues elasticity orientation_rate resolved_shear
               elastic_stretch plastic_deformation_rate plastic_spin
               sum_slip_rates slip_rule slip_strength voce_hardening
               integrate_slip_hardening integrate_elastic_strain integrate_orientation"
   []
+[]
+
+[EquationSystems]
+  [eq_sys]
+    type = NonlinearSystem
+    model = 'implicit_rate'
+  []
+[]
+
+[Solvers]
+  [newton]
+    type = NewtonWithLineSearch
+    max_linesearch_iterations = 5
+    linear_solver = 'lu'
+  []
+  [lu]
+    type = DenseLU
+  []
+[]
+
+[Models]
   [model_without_stress]
     type = ImplicitUpdate
-    implicit_model = 'implicit_rate'
+    equation_system = 'eq_sys'
     solver = 'newton'
   []
   [full_stress]

modules/solid_mechanics/test/tests/neml2/crystal_plasticity/exact_kinematics_neml2.i

@@ -13,13 +13,6 @@
   []
 []
 
-[Solvers]
-  [newton]
-    type = NewtonWithLineSearch
-    max_linesearch_iterations = 5
-  []
-[]
-
 [Data]
   [crystal_geometry]
     type = CubicCrystal
@@ -124,9 +117,30 @@
               plastic_velgrad plastic_defgrad_rate
               integrate_slip_hardening integrate_plastic_defgrad"
   []
+[]
+
+[EquationSystems]
+  [eq_sys]
+    type = NonlinearSystem
+    model = 'implicit_rate'
+  []
+[]
+
+[Solvers]
+  [newton]
+    type = NewtonWithLineSearch
+    max_linesearch_iterations = 5
+    linear_solver = 'lu'
+  []
+  [lu]
+    type = DenseLU
+  []
+[]
+
+[Models]
   [model_without_stress]
     type = ImplicitUpdate
-    implicit_model = 'implicit_rate'
+    equation_system = 'eq_sys'
     solver = 'newton'
   []
   # Convert PK2 stress to a full second order tensor

modules/solid_mechanics/test/tests/neml2/laromance/models/laromance_matl_radial_return.i

@@ -1,12 +1,5 @@
 # UNITS are MPa
-[Solvers]
-  [newton]
-    type = Newton
-    abs_tol = 1e-8
-    rel_tol = 1e-6
-    # verbose = true
-  []
-[]
+
 [Models]
   #####################################################################################
   # Compute the invariant plastic flow direction since we are doing J2 radial return
@@ -97,9 +90,31 @@
     models = "plastic_update stress_update vonmises rom_ep
               integrate_ep"
   []
+[]
+
+[EquationSystems]
+  [eq_sys]
+    type = NonlinearSystem
+    model = 'rate'
+  []
+[]
+
+[Solvers]
+  [newton]
+    type = Newton
+    abs_tol = 1e-8
+    rel_tol = 1e-6
+    linear_solver = 'lu'
+  []
+  [lu]
+    type = DenseLU
+  []
+[]
+
+[Models]
   [radial_return]
     type = ImplicitUpdate
-    implicit_model = 'rate'
+    equation_system = 'eq_sys'
     solver = 'newton'
   []
   #####################################################################################

modules/solid_mechanics/test/tests/neml2/plasticity/isoharden_neml2.i

@@ -1,9 +1,3 @@
-[Solvers]
-  [newton]
-    type = Newton
-  []
-[]
-
 [Models]
   [isoharden]
     type = VoceIsotropicHardening
@@ -70,9 +64,29 @@
               yield normality eprate Eprate
               consistency integrate_ep integrate_Ep"
   []
+[]
+
+[EquationSystems]
+  [eq_sys]
+    type = NonlinearSystem
+    model = 'surface'
+  []
+[]
+
+[Solvers]
+  [newton]
+    type = Newton
+    linear_solver = 'lu'
+  []
+  [lu]
+    type = DenseLU
+  []
+[]
+
+[Models]
   [return_map]
     type = ImplicitUpdate
-    implicit_model = 'surface'
+    equation_system = 'eq_sys'
     solver = 'newton'
   []
   [model]

modules/solid_mechanics/test/tests/neml2/plasticity/isokinharden_neml2.i

@@ -1,9 +1,3 @@
-[Solvers]
-  [newton]
-    type = Newton
-  []
-[]
-
 [Models]
   [isoharden]
     type = VoceIsotropicHardening
@@ -87,9 +81,29 @@
               yield normality eprate Kprate Eprate
               consistency integrate_ep integrate_Kp integrate_Ep"
   []
+[]
+
+[EquationSystems]
+  [eq_sys]
+    type = NonlinearSystem
+    model = 'surface'
+  []
+[]
+
+[Solvers]
+  [newton]
+    type = Newton
+    linear_solver = 'lu'
+  []
+  [lu]
+    type = DenseLU
+  []
+[]
+
+[Models]
   [return_map]
     type = ImplicitUpdate
-    implicit_model = 'surface'
+    equation_system = 'eq_sys'
     solver = 'newton'
   []
   [model]

modules/solid_mechanics/test/tests/neml2/plasticity/kinharden_neml2.i

@@ -1,9 +1,3 @@
-[Solvers]
-  [newton]
-    type = Newton
-  []
-[]
-
 [Models]
   [kinharden]
     type = LinearKinematicHardening
@@ -74,9 +68,29 @@
               yield normality Kprate Eprate
               consistency integrate_Kp integrate_Ep"
   []
+[]
+
+[EquationSystems]
+  [eq_sys]
+    type = NonlinearSystem
+    model = 'surface'
+  []
+[]
+
+[Solvers]
+  [newton]
+    type = Newton
+    linear_solver = 'lu'
+  []
+  [lu]
+    type = DenseLU
+  []
+[]
+
+[Models]
   [return_map]
     type = ImplicitUpdate
-    implicit_model = 'surface'
+    equation_system = 'eq_sys'
     solver = 'newton'
   []
   [model]

modules/solid_mechanics/test/tests/neml2/plasticity/perfect_neml2.i

@@ -1,9 +1,3 @@
-[Solvers]
-  [newton]
-    type = Newton
-  []
-[]
-
 [Models]
   [elastic_strain]
     type = SR2LinearCombination
@@ -57,9 +51,29 @@
               yield normality Eprate
               consistency integrate_Ep"
   []
+[]
+
+[EquationSystems]
+  [eq_sys]
+    type = NonlinearSystem
+    model = 'surface'
+  []
+[]
+
+[Solvers]
+  [newton]
+    type = Newton
+    linear_solver = 'lu'
+  []
+  [lu]
+    type = DenseLU
+  []
+[]
+
+[Models]
   [return_map]
     type = ImplicitUpdate
-    implicit_model = 'surface'
+    equation_system = 'eq_sys'
     solver = 'newton'
   []
   [model]