Move more packages from 'internal/pkg' to 'pkg'

gvallee · gvallee · commit 097769545fba · 2019-12-15T14:46:32.000-05:00
Move more packages from 'internal/pkg' to 'pkg' so they can used by syvalidate

Signed-off-by: Geoffroy Vallee &lt;geoffroy.vallee@gmail.com&gt;
diff --git a/cmd/sympi/sympi.go b/cmd/sympi/sympi.go
@@ -18,12 +18,12 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/gvallee/kv/pkg/kv"
-	"github.com/sylabs/singularity-mpi/internal/pkg/builder"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
 	"github.com/sylabs/singularity-mpi/internal/pkg/sympierr"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/builder"
 	"github.com/sylabs/singularity-mpi/pkg/checker"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sy"
 	"github.com/sylabs/singularity-mpi/pkg/sympi"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
diff --git a/internal/pkg/deffile/deffile.go b/internal/pkg/deffile/deffile.go
@@ -16,11 +16,11 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/sylabs/singularity-mpi/internal/pkg/distro"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/internal/pkg/ldd"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
 	"github.com/sylabs/singularity-mpi/pkg/container"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/internal/pkg/deffile/deffile_test.go b/internal/pkg/deffile/deffile_test.go
@@ -13,9 +13,9 @@ import (
 	"testing"
 
 	"github.com/sylabs/singularity-mpi/internal/pkg/distro"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/internal/pkg/impi/impi.go b/internal/pkg/impi/impi.go
@@ -17,8 +17,8 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/sylabs/singularity-mpi/internal/pkg/deffile"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
diff --git a/internal/pkg/job/job.go b/internal/pkg/job/job.go
@@ -8,9 +8,9 @@ package job
 import (
 	"bytes"
 
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/container"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/internal/pkg/persistent/persistent.go b/internal/pkg/persistent/persistent.go
@@ -8,7 +8,7 @@ package persistent
 import (
 	"path/filepath"
 
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/pkg/buildenv/buildenv.go b/pkg/buildenv/buildenv.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/gvallee/kv/pkg/kv"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/internal/pkg/persistent"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
@@ -21,14 +21,14 @@ import (
 	"github.com/sylabs/singularity-mpi/internal/pkg/deffile"
 	"github.com/sylabs/singularity-mpi/internal/pkg/distro"
 	"github.com/sylabs/singularity-mpi/internal/pkg/impi"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
-	"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/internal/pkg/mpich"
 	"github.com/sylabs/singularity-mpi/internal/pkg/openmpi"
 	"github.com/sylabs/singularity-mpi/internal/pkg/persistent"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
 	"github.com/sylabs/singularity-mpi/pkg/container"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/sy"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
diff --git a/pkg/container/container.go b/pkg/container/container.go
@@ -18,9 +18,9 @@ import (
 	"time"
 
 	"github.com/gvallee/go_util/pkg/util"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
 	"github.com/sylabs/singularity-mpi/pkg/checker"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sy"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
diff --git a/pkg/containerizer/containerizer.go b/pkg/containerizer/containerizer.go
@@ -15,14 +15,14 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/gvallee/kv/pkg/kv"
-	"github.com/sylabs/singularity-mpi/internal/pkg/builder"
 	"github.com/sylabs/singularity-mpi/internal/pkg/deffile"
 	"github.com/sylabs/singularity-mpi/internal/pkg/distro"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
-	"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/builder"
 	"github.com/sylabs/singularity-mpi/pkg/container"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/pkg/containerizer/containerizer_env.go b/pkg/containerizer/containerizer_env.go
@@ -11,9 +11,9 @@ import (
 	"path/filepath"
 
 	"github.com/gvallee/kv/pkg/kv"
-	"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
 	"github.com/sylabs/singularity-mpi/pkg/container"
+	"github.com/sylabs/singularity-mpi/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/pkg/implem/implem.go b/pkg/implem/implem.go
diff --git a/pkg/jm/jm.go b/pkg/jm/jm.go
diff --git a/pkg/jm/jm_test.go b/pkg/jm/jm_test.go
diff --git a/pkg/jm/jobmgr_native.go b/pkg/jm/jobmgr_native.go
@@ -13,10 +13,10 @@ import (
 	"strconv"
 
 	"github.com/sylabs/singularity-mpi/internal/pkg/impi"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/internal/pkg/job"
-	"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
diff --git a/pkg/jm/jobmgr_prun.go b/pkg/jm/jobmgr_prun.go
diff --git a/pkg/jm/jobmgr_slurm.go b/pkg/jm/jobmgr_slurm.go
@@ -16,10 +16,10 @@ import (
 
 	"github.com/gvallee/kv/pkg/kv"
 	"github.com/sylabs/singularity-mpi/internal/pkg/job"
-	"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/internal/pkg/slurm"
 	"github.com/sylabs/singularity-mpi/internal/pkg/sympierr"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/sy"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
diff --git a/pkg/jm/jobmgr_slurm_test.go b/pkg/jm/jobmgr_slurm_test.go
diff --git a/pkg/launcher/launcher.go b/pkg/launcher/launcher.go
@@ -20,14 +20,14 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/gvallee/kv/pkg/kv"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
-	"github.com/sylabs/singularity-mpi/internal/pkg/jm"
 	"github.com/sylabs/singularity-mpi/internal/pkg/job"
-	"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/internal/pkg/network"
 	"github.com/sylabs/singularity-mpi/internal/pkg/slurm"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/jm"
+	"github.com/sylabs/singularity-mpi/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/results"
 	"github.com/sylabs/singularity-mpi/pkg/sy"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
diff --git a/pkg/mpi/mpi.go b/pkg/mpi/mpi.go
@@ -10,12 +10,12 @@ import (
 	"path/filepath"
 
 	"github.com/sylabs/singularity-mpi/internal/pkg/impi"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
 	"github.com/sylabs/singularity-mpi/internal/pkg/openmpi"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
 	"github.com/sylabs/singularity-mpi/pkg/container"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/pkg/results/results.go b/pkg/results/results.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 
 	"github.com/gvallee/go_util/pkg/util"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 )
 
 // Result represents the result of a given experiment
diff --git a/pkg/sy/sy.go b/pkg/sy/sy.go
@@ -20,10 +20,10 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/gvallee/kv/pkg/kv"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
 	"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
 	"github.com/sylabs/singularity-mpi/pkg/checker"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
diff --git a/pkg/sy/sy_test.go b/pkg/sy/sy_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
 	"github.com/sylabs/singularity-mpi/pkg/sys"
 )
 
diff --git a/pkg/sympi/sympi.go b/pkg/sympi/sympi.go
@@ -18,15 +18,15 @@ import (
 
 	"github.com/gvallee/go_util/pkg/util"
 	"github.com/gvallee/kv/pkg/kv"
-	"github.com/sylabs/singularity-mpi/internal/pkg/builder"
-	"github.com/sylabs/singularity-mpi/internal/pkg/implem"
-	"github.com/sylabs/singularity-mpi/internal/pkg/jm"
 	"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
-	"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/app"
 	"github.com/sylabs/singularity-mpi/pkg/buildenv"
+	"github.com/sylabs/singularity-mpi/pkg/builder"
 	"github.com/sylabs/singularity-mpi/pkg/container"
+	"github.com/sylabs/singularity-mpi/pkg/implem"
+	"github.com/sylabs/singularity-mpi/pkg/jm"
 	"github.com/sylabs/singularity-mpi/pkg/launcher"
+	"github.com/sylabs/singularity-mpi/pkg/mpi"
 	"github.com/sylabs/singularity-mpi/pkg/sy"
 	"github.com/sylabs/singularity-mpi/pkg/syexec"
 	"github.com/sylabs/singularity-mpi/pkg/sys"

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ import (`
`13`	`13`	`"testing"`
`14`	`14`
`15`	`15`	`"github.com/sylabs/singularity-mpi/internal/pkg/distro"`
`16`		`- "github.com/sylabs/singularity-mpi/internal/pkg/implem"`
`17`	`16`	`"github.com/sylabs/singularity-mpi/pkg/app"`
`18`	`17`	`"github.com/sylabs/singularity-mpi/pkg/buildenv"`
	`18`	`+ "github.com/sylabs/singularity-mpi/pkg/implem"`
`19`	`19`	`"github.com/sylabs/singularity-mpi/pkg/sys"`
`20`	`20`	`)`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ import (`
`17`	`17`
`18`	`18`	`"github.com/gvallee/go_util/pkg/util"`
`19`	`19`	`"github.com/sylabs/singularity-mpi/internal/pkg/deffile"`
`20`		`- "github.com/sylabs/singularity-mpi/internal/pkg/implem"`
`21`	`20`	`"github.com/sylabs/singularity-mpi/pkg/buildenv"`
	`21`	`+ "github.com/sylabs/singularity-mpi/pkg/implem"`
`22`	`22`	`"github.com/sylabs/singularity-mpi/pkg/syexec"`
`23`	`23`	`"github.com/sylabs/singularity-mpi/pkg/sys"`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ package job`
`8`	`8`	`import (`
`9`	`9`	`"bytes"`
`10`	`10`
`11`		`- "github.com/sylabs/singularity-mpi/internal/pkg/implem"`
`12`	`11`	`"github.com/sylabs/singularity-mpi/pkg/app"`
`13`	`12`	`"github.com/sylabs/singularity-mpi/pkg/container"`
	`13`	`+ "github.com/sylabs/singularity-mpi/pkg/implem"`
`14`	`14`	`"github.com/sylabs/singularity-mpi/pkg/sys"`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ package persistent`
`8`	`8`	`import (`
`9`	`9`	`"path/filepath"`
`10`	`10`
`11`		`- "github.com/sylabs/singularity-mpi/internal/pkg/implem"`
	`11`	`+ "github.com/sylabs/singularity-mpi/pkg/implem"`
`12`	`12`	`"github.com/sylabs/singularity-mpi/pkg/sys"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ import (`
`23`	`23`
`24`	`24`	`"github.com/gvallee/go_util/pkg/util"`
`25`	`25`	`"github.com/gvallee/kv/pkg/kv"`
`26`		`- "github.com/sylabs/singularity-mpi/internal/pkg/implem"`
`27`	`26`	`"github.com/sylabs/singularity-mpi/internal/pkg/persistent"`
	`27`	`+ "github.com/sylabs/singularity-mpi/pkg/implem"`
`28`	`28`	`"github.com/sylabs/singularity-mpi/pkg/syexec"`
`29`	`29`	`"github.com/sylabs/singularity-mpi/pkg/sys"`
`30`	`30`	`)`