set partials update (restore tests)

Author: dehann

src/services/NumericalCalculations.jl

@@ -362,10 +362,9 @@ function _solveCCWNumeric!(
   perturb::Real = 1e-10,
 ) where {N_, F <: AbstractRelative, S, T}
   #
-
+  
   #
   # thrid = Threads.threadid()
-
   smpid = ccwl.particleidx[]
   # cannot Nelder-Mead on 1dim, partial can be 1dim or more but being conservative.
   islen1 = length(ccwl.partialDims) == 1 || ccwl.partial
@@ -377,10 +376,11 @@ function _solveCCWNumeric!(
   #  a separate deepcopy of the destination (aka target) memory is necessary.
   #  Choosen solution is to splice together ccwl.varValsAll each time, with destination as 
   #  deepcopy but other input variables are just point to the source variable values directly. 
-  if ccwl.partial
-    target = view(ccwl.varValsAll[][ccwl.varidx[]][smpid], ccwl.partialDims)
+  target = if ccwl.partial  # FIXME likely type-instability on `typeof(target)`
+    # view(ccwl.varValsAll[][ccwl.varidx[]][smpid], ccwl.partialDims)
+    ccwl.varValsAll[][ccwl.varidx[]][smpid][ccwl.partialDims]
   else
-    target = ccwl.varValsAll[][ccwl.varidx[]][smpid];
+    ccwl.varValsAll[][ccwl.varidx[]][smpid]
   end
   # build the pre-objective function for this sample's hypothesis selection
   unrollHypo!, _ = _buildCalcFactorLambdaSample(
@@ -407,12 +407,13 @@ function _solveCCWNumeric!(
   # target .+= _perturbIfNecessary(getFactorType(ccwl), length(target), perturb)
   sfidx = ccwl.varidx[]
   # do the parameter search over defined decision variables using Minimization
-  if ccwl.partial
-    X = collect(view(ccwl.varValsAll[][sfidx][smpid], ccwl.partialDims))
-  else
-    X = ccwl.varValsAll[][sfidx][smpid][ccwl.partialDims]
-  end
-  # X = destVarVals[smpid]#[ccwl.partialDims]
+  X = ccwl.varValsAll[][sfidx][smpid][ccwl.partialDims]
+  # X = if ccwl.partial # TODO check for type-instability on `X`
+  #   collect(view(ccwl.varValsAll[][sfidx][smpid], ccwl.partialDims))
+  # else
+  #   ccwl.varValsAll[][sfidx][smpid][ccwl.partialDims]
+  # end
+  # # X = destVarVals[smpid]#[ccwl.partialDims]
 
   retval = _solveLambdaNumeric(
     getFactorType(ccwl), 
@@ -430,7 +431,11 @@ function _solveCCWNumeric!(
 
   # insert result back at the correct variable element location
   if ccwl.partial
-    ccwl.varValsAll[][sfidx][smpid][ccwl.partialDims] .= retval
+    # NOTE use workaround of TranslationGroup for coordinates on partial assignment
+    # FIXME consolidate to Manopt and upgrade to Riemannian (i.e. incl non-groups)
+    M = TranslationGroup(length(ccwl.varValsAll[][sfidx][smpid]))
+    setPointPartial!(M, ccwl.varValsAll[][sfidx][smpid], M, retval,ccwl.partialDims,true )
+    # ccwl.varValsAll[][sfidx][smpid][ccwl.partialDims] .= retval
   else
     # copyto!(ccwl.varValsAll[sfidx][smpid], retval)
     copyto!(ccwl.varValsAll[][sfidx][smpid][ccwl.partialDims], retval)

test/runtests.jl

@@ -5,7 +5,7 @@ TEST_GROUP = get(ENV, "IIF_TEST_GROUP", "all")
 # temporarily moved to start (for debugging)
 #...
 if TEST_GROUP in ["all", "tmp_debug_group"]
-include("testSpecialOrthogonalMani.jl")
+# include("testSpecialOrthogonalMani.jl")
 # include("testDERelative.jl")
 # include("testpartialconstraint.jl")
 
@@ -14,51 +14,51 @@ include("priorusetest.jl")
 end
 
 if TEST_GROUP in ["all", "basic_functional_group"]
-  # more frequent stochasic failures from numerics
-# include("manifolds/manifolddiff.jl")
-# include("manifolds/factordiff.jl")
-# include("testSpecialEuclidean2Mani.jl")
-# include("testEuclidDistance.jl")
-
-# # regular testing
-# include("testSphereMani.jl")
-# include("testBasicManifolds.jl")
-
-# # start as basic as possible and build from there
-# include("typeReturnMemRef.jl")
-# include("testDistributionsGeneric.jl")
-# include("testHeatmapGridDensity.jl")
-# include("testCliqSolveDbgUtils.jl")
-# include("basicGraphsOperations.jl")
-
-# # include("TestModuleFunctions.jl")
-# include("testCompareVariablesFactors.jl")
-# include("saveconvertertypes.jl")
-# include("testgraphpackingconverters.jl")
-# include("testSaveLoadDFG.jl")
-
-# include("testPackingMixtures.jl")
-
-# include("testJunctionTreeConstruction.jl")
-# include("testBayesTreeiSAM2Example.jl")
-# include("testTreeFunctions.jl")
-
-# #FIXME fails on MetaBayesTree
-# include("testTreeSaveLoad.jl")
-
-# @error "Gradient tests must be updated and restored for new ccw.varValsAll[]"
-# # include("testGradientUtils.jl")
-# # include("testFactorGradients.jl")
-# include("testSpecialSampler.jl") # TODO, rename, refine
-# include("testCommonConvWrapper.jl")
-
-# include("testApproxConv.jl")
-# include("testBasicForwardConvolve.jl")
-# include("testUseMsgLikelihoods.jl")
-# include("testDefaultDeconv.jl")
-
-# include("testPartialFactors.jl")
-# include("testPartialPrior.jl")
+# more frequent stochasic failures from numerics
+include("manifolds/manifolddiff.jl")
+include("manifolds/factordiff.jl")
+include("testSpecialEuclidean2Mani.jl")
+include("testEuclidDistance.jl")
+
+# regular testing
+include("testSphereMani.jl")
+include("testBasicManifolds.jl")
+
+# start as basic as possible and build from there
+include("typeReturnMemRef.jl")
+include("testDistributionsGeneric.jl")
+include("testHeatmapGridDensity.jl")
+include("testCliqSolveDbgUtils.jl")
+include("basicGraphsOperations.jl")
+
+# include("TestModuleFunctions.jl")
+include("testCompareVariablesFactors.jl")
+include("saveconvertertypes.jl")
+include("testgraphpackingconverters.jl")
+include("testSaveLoadDFG.jl")
+
+include("testPackingMixtures.jl")
+
+include("testJunctionTreeConstruction.jl")
+include("testBayesTreeiSAM2Example.jl")
+include("testTreeFunctions.jl")
+
+#FIXME fails on MetaBayesTree
+include("testTreeSaveLoad.jl")
+
+@error "Gradient tests must be updated and restored for new ccw.varValsAll[]"
+# include("testGradientUtils.jl")
+# include("testFactorGradients.jl")
+include("testSpecialSampler.jl") # TODO, rename, refine
+include("testCommonConvWrapper.jl")
+
+include("testApproxConv.jl")
+include("testBasicForwardConvolve.jl")
+include("testUseMsgLikelihoods.jl")
+include("testDefaultDeconv.jl")
+
+include("testPartialFactors.jl")
+include("testPartialPrior.jl")
 
 include("testPartialNH.jl")
 include("testMixturePrior.jl")

test/testpartialconstraint.jl

@@ -59,21 +59,19 @@ f2  = addFactor!(fg,[:x1],dp, graphinit=false)
 
 doautoinit!(fg, :x1)
 
-##
 
 @testset "test evaluation of full constraint prior" begin
-
+##
 
 pts_, _ = evalFactor(fg, f1, v1.label, N=N)
 @cast pts[i,j] := pts_[j][i]
 @test size(pts,1) == 2
 @test size(pts,2) == N
 @test norm(Statistics.mean(pts,dims=2)[1] .- [0.0]) < 0.3
 
-
+##
 end
 
-##
 
 @testset "test evaluation of partial constraint prior" begin
 ##