Step back: Reintroduce SATState without getting rid of PackageInfo

Author: jmgomez

config.nims

@@ -6,3 +6,4 @@ switch("define", "ssl")
 switch("path", "vendor" / "zippy" / "src")
 switch("path", "vendor" / "sat" / "src")
 switch("path", "vendor" / "checksums" / "src")
+switch("define", "zippyNoSimd")

src/nimble.nim

@@ -83,11 +83,10 @@ proc addReverseDeps(solvedPkgs: seq[SolvedPackage], allPkgsInfo: seq[PackageInfo
 proc processFreeDependenciesSAT(rootPkgInfo: PackageInfo, options: Options): HashSet[PackageInfo] = 
   if satProccesedPackages.len > 0:
     return satProccesedPackages
-  var solvedPkgs = newSeq[SolvedPackage]()
-  var pkgsToInstall: seq[(string, Version)] = @[]
   var rootPkgInfo = rootPkgInfo
   rootPkgInfo.requires &= options.extraRequires
   var pkgList = initPkgList(rootPkgInfo, options).mapIt(it.toFullInfo(options))
+  var state = initSATState(pkgList)
   var allPkgsInfo: seq[PackageInfo] = pkgList & rootPkgInfo
   #Remove from the pkglist the packages that exists in lock file and has a different vcsRevision
   var upgradeVersions = initTable[string, VersionRange]()
@@ -107,14 +106,15 @@ proc processFreeDependenciesSAT(rootPkgInfo: PackageInfo, options: Options): Has
               toRemoveFromLocked.add pkg
 
   var systemNimCompatible = options.nimBin.isSome
-  result = solveLocalPackages(rootPkgInfo, pkgList, solvedPkgs, systemNimCompatible,  options)
-  if solvedPkgs.len > 0: 
-    displaySatisfiedMsg(solvedPkgs, pkgsToInstall, options)
-    addReverseDeps(solvedPkgs, allPkgsInfo, options)
+  solveLocalPackages(rootPkgInfo, state, systemNimCompatible,  options)
+  result = state.solution
+  if state.foundSolution(): 
+    displaySatisfiedMsg(state.solvedPkgs, state.pkgToInstall, options)
+    addReverseDeps(state.solvedPkgs, allPkgsInfo, options)
     for pkg in allPkgsInfo:
       if pkg.basicInfo.name.isNim and systemNimCompatible:
         continue #Dont add nim from the solution as we will use system nim
-      result.incl pkg
+      result.incl pkg #TODO likely this is only adding root. But review later
     for nonLocked in toRemoveFromLocked:
       #only remove if the vcsRevision is different
       for pkg in result:
@@ -126,13 +126,14 @@ proc processFreeDependenciesSAT(rootPkgInfo: PackageInfo, options: Options): Has
       .toHashSet
     satProccesedPackages = result
     return result
-
-  var output = ""
-  result = solvePackages(rootPkgInfo, pkgList, pkgsToInstall, options, output, solvedPkgs)
-  displaySatisfiedMsg(solvedPkgs, pkgsToInstall, options)
-  displayUsingSpecialVersionWarning(solvedPkgs, options)
-  var solved = solvedPkgs.len > 0 #A pgk can be solved and still dont return a set of PackageInfo
-  for (name, ver) in pkgsToInstall:
+  
+  state = initSATState(pkgList)
+  solvePackages(rootPkgInfo, state, options)
+  result = state.solution
+  displaySatisfiedMsg(state.solvedPkgs, state.pkgToInstall, options)
+  displayUsingSpecialVersionWarning(state.solvedPkgs, options)
+  var solved = state.foundSolution() #A pgk can be solved and still dont return a set of PackageInfo  
+  for (name, ver) in state.pkgToInstall:
     var versionRange = ver.toVersionRange
     if name in upgradeVersions:
       versionRange = upgradeVersions[name]
@@ -151,7 +152,7 @@ proc processFreeDependenciesSAT(rootPkgInfo: PackageInfo, options: Options): Has
 
   for pkg in result:
     allPkgsInfo.add pkg
-  addReverseDeps(solvedPkgs, allPkgsInfo, options)
+  addReverseDeps(state.solvedPkgs, allPkgsInfo, options)
 
   for nonLocked in toRemoveFromLocked:
     result.excl nonLocked
@@ -160,7 +161,7 @@ proc processFreeDependenciesSAT(rootPkgInfo: PackageInfo, options: Options): Has
   satProccesedPackages = result
 
   if not solved:
-    display("Error", output, Error, priority = HighPriority)
+    display("Error", state.output, Error, priority = HighPriority)
     raise nimbleError("Unsatisfiable dependencies")
 
 proc processFreeDependencies(pkgInfo: PackageInfo,

src/nimblepkg/nimblesat.nim

@@ -63,10 +63,29 @@ type
     versions: seq[PackageMinimalInfo]
 
   VersionAttempt = tuple[pkgName: string, version: Version]
+  SATState* = object
+    pkgList*: seq[PackageInfo]
+    pkgVersions*: Table[string, PackageVersions]
+    solvedPkgs*: seq[SolvedPackage]
+    solution*: HashSet[PackageInfo]    
+    pkgToInstall*: seq[(string, Version)]
+    output*: string
 
 
 const TaggedVersionsFileName* = "tagged_versions.json"
 
+proc initSATState*(pkgList: seq[PackageInfo]): SATState =
+  result.pkgList = pkgList
+  result.pkgVersions = initTable[string, PackageVersions]()
+  result.solvedPkgs = @[]
+  result.solution = initHashSet[PackageInfo]()
+  result.pkgToInstall = @[]
+  result.output = ""
+
+
+proc foundSolution*(state: SATState): bool =
+  state.solvedPkgs.len > 0 #TODO add a flag as well to make sure it ran
+ 
 proc initFromJson*(dst: var PkgTuple, jsonNode: JsonNode, jsonPath: var string) =
   dst = parseRequires(jsonNode.str)
 
@@ -684,43 +703,40 @@ proc isSystemNimCompatible*(solvedPkgs: seq[SolvedPackage], options: Options): b
         return false
   true
 
-proc solveLocalPackages*(rootPkgInfo: PackageInfo, pkgList: seq[PackageInfo], solvedPkgs: var seq[SolvedPackage], systemNimCompatible: var bool, options: Options): HashSet[PackageInfo] = 
+proc solveLocalPackages*(rootPkgInfo: PackageInfo, state: var SATState, systemNimCompatible: var bool, options: Options) = 
   var root = rootPkgInfo.getMinimalInfo(options)
   root.isRoot = true
-  var pkgVersionTable = initTable[string, PackageVersions]()
-  pkgVersionTable[root.name] = PackageVersions(pkgName: root.name, versions: @[root])
-  fillPackageTableFromPreferred(pkgVersionTable, pkgList.mapIt(it.getMinimalInfo(options)))
-  var output = ""
-  solvedPkgs = pkgVersionTable.getSolvedPackages(output)
-  systemNimCompatible = solvedPkgs.isSystemNimCompatible(options)
+  state.pkgVersions[root.name] = PackageVersions(pkgName: root.name, versions: @[root])
+  fillPackageTableFromPreferred(state.pkgVersions, state.pkgList.mapIt(it.getMinimalInfo(options)))
+  state.solvedPkgs = state.pkgVersions.getSolvedPackages(state.output)
+  systemNimCompatible = state.solvedPkgs.isSystemNimCompatible(options)
 
-  for solvedPkg in solvedPkgs:
+  for solvedPkg in state.solvedPkgs:
     if solvedPkg.pkgName.isNim and systemNimCompatible:     
       continue #Dont add nim from the solution as we will use system nim
-    for pkgInfo in pkgList:
+    for pkgInfo in state.pkgList:
       if pkgInfo.basicInfo.name == solvedPkg.pkgName and pkgInfo.basicInfo.version == solvedPkg.version:
-        result.incl pkgInfo
+        state.solution.incl pkgInfo
 
-proc solvePackages*(rootPkg: PackageInfo, pkgList: seq[PackageInfo], pkgsToInstall: var seq[(string, Version)], options: Options, output: var string, solvedPkgs: var seq[SolvedPackage]): HashSet[PackageInfo] =
+proc solvePackages*(rootPkg: PackageInfo, state: var SATState, options: Options) =
   var root: PackageMinimalInfo = rootPkg.getMinimalInfo(options)
   root.isRoot = true
-  var pkgVersionTable = initTable[string, PackageVersions]()
-  pkgVersionTable[root.name] = PackageVersions(pkgName: root.name, versions: @[root])
-  collectAllVersions(pkgVersionTable, root, options, downloadMinimalPackage, pkgList.mapIt(it.getMinimalInfo(options)))
-  solvedPkgs = pkgVersionTable.getSolvedPackages(output).topologicalSort()
-  let systemNimCompatible = solvedPkgs.isSystemNimCompatible(options)
+  state.pkgVersions[root.name] = PackageVersions(pkgName: root.name, versions: @[root])
+  collectAllVersions(state.pkgVersions, root, options, downloadMinimalPackage, state.pkgList.mapIt(it.getMinimalInfo(options)))
+  state.solvedPkgs = state.pkgVersions.getSolvedPackages(state.output).topologicalSort()
+  let systemNimCompatible = state.solvedPkgs.isSystemNimCompatible(options)
 
-  for solvedPkg in solvedPkgs:
+  for solvedPkg in state.solvedPkgs:
     if solvedPkg.pkgName == root.name: continue    
     var foundInList = false
-    for pkgInfo in pkgList:
+    for pkgInfo in state.pkgList:
       if pkgInfo.basicInfo.name == solvedPkg.pkgName and pkgInfo.basicInfo.version == solvedPkg.version:
-        result.incl pkgInfo
+        state.solution.incl pkgInfo
         foundInList = true
     if not foundInList:
       if solvedPkg.pkgName.isNim and systemNimCompatible:
         continue #Skips systemNim
-      pkgsToInstall.addUnique((solvedPkg.pkgName, solvedPkg.version))
+      state.pkgToInstall.addUnique((solvedPkg.pkgName, solvedPkg.version))
 
 proc getPackageInfo*(name: string, pkgs: seq[PackageInfo], version: Option[Version] = none(Version)): Option[PackageInfo] =
     for pkg in pkgs:

tests/nim.cfg

@@ -1,2 +1,3 @@
 --path:"$nim/"
 --path:"../src/"
+--define:zippyNoSimd