Skip to content

Commit 8de850f

Browse files
authored
Merge pull request #77 from gvallee/move_pkgs
Move more packages from 'internal/pkg' to 'pkg'
2 parents 6732685 + 0977695 commit 8de850f

24 files changed

+29
-29
lines changed

cmd/sympi/sympi.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818

1919
"github.com/gvallee/go_util/pkg/util"
2020
"github.com/gvallee/kv/pkg/kv"
21-
"github.com/sylabs/singularity-mpi/internal/pkg/builder"
22-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
2321
"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
2422
"github.com/sylabs/singularity-mpi/internal/pkg/sympierr"
2523
"github.com/sylabs/singularity-mpi/pkg/buildenv"
24+
"github.com/sylabs/singularity-mpi/pkg/builder"
2625
"github.com/sylabs/singularity-mpi/pkg/checker"
26+
"github.com/sylabs/singularity-mpi/pkg/implem"
2727
"github.com/sylabs/singularity-mpi/pkg/sy"
2828
"github.com/sylabs/singularity-mpi/pkg/sympi"
2929
"github.com/sylabs/singularity-mpi/pkg/sys"

internal/pkg/deffile/deffile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616

1717
"github.com/gvallee/go_util/pkg/util"
1818
"github.com/sylabs/singularity-mpi/internal/pkg/distro"
19-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
2019
"github.com/sylabs/singularity-mpi/internal/pkg/ldd"
2120
"github.com/sylabs/singularity-mpi/pkg/app"
2221
"github.com/sylabs/singularity-mpi/pkg/buildenv"
2322
"github.com/sylabs/singularity-mpi/pkg/container"
23+
"github.com/sylabs/singularity-mpi/pkg/implem"
2424
"github.com/sylabs/singularity-mpi/pkg/sys"
2525
)
2626

internal/pkg/deffile/deffile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"testing"
1414

1515
"github.com/sylabs/singularity-mpi/internal/pkg/distro"
16-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
1716
"github.com/sylabs/singularity-mpi/pkg/app"
1817
"github.com/sylabs/singularity-mpi/pkg/buildenv"
18+
"github.com/sylabs/singularity-mpi/pkg/implem"
1919
"github.com/sylabs/singularity-mpi/pkg/sys"
2020
)
2121

internal/pkg/impi/impi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717

1818
"github.com/gvallee/go_util/pkg/util"
1919
"github.com/sylabs/singularity-mpi/internal/pkg/deffile"
20-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
2120
"github.com/sylabs/singularity-mpi/pkg/buildenv"
21+
"github.com/sylabs/singularity-mpi/pkg/implem"
2222
"github.com/sylabs/singularity-mpi/pkg/syexec"
2323
"github.com/sylabs/singularity-mpi/pkg/sys"
2424
)

internal/pkg/job/job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ package job
88
import (
99
"bytes"
1010

11-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
1211
"github.com/sylabs/singularity-mpi/pkg/app"
1312
"github.com/sylabs/singularity-mpi/pkg/container"
13+
"github.com/sylabs/singularity-mpi/pkg/implem"
1414
"github.com/sylabs/singularity-mpi/pkg/sys"
1515
)
1616

internal/pkg/persistent/persistent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package persistent
88
import (
99
"path/filepath"
1010

11-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
11+
"github.com/sylabs/singularity-mpi/pkg/implem"
1212
"github.com/sylabs/singularity-mpi/pkg/sys"
1313
)
1414

pkg/buildenv/buildenv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"github.com/gvallee/go_util/pkg/util"
2525
"github.com/gvallee/kv/pkg/kv"
26-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
2726
"github.com/sylabs/singularity-mpi/internal/pkg/persistent"
27+
"github.com/sylabs/singularity-mpi/pkg/implem"
2828
"github.com/sylabs/singularity-mpi/pkg/syexec"
2929
"github.com/sylabs/singularity-mpi/pkg/sys"
3030
)

internal/pkg/builder/builder.go renamed to pkg/builder/builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import (
2121
"github.com/sylabs/singularity-mpi/internal/pkg/deffile"
2222
"github.com/sylabs/singularity-mpi/internal/pkg/distro"
2323
"github.com/sylabs/singularity-mpi/internal/pkg/impi"
24-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
25-
"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
2624
"github.com/sylabs/singularity-mpi/internal/pkg/mpich"
2725
"github.com/sylabs/singularity-mpi/internal/pkg/openmpi"
2826
"github.com/sylabs/singularity-mpi/internal/pkg/persistent"
2927
"github.com/sylabs/singularity-mpi/pkg/app"
3028
"github.com/sylabs/singularity-mpi/pkg/buildenv"
3129
"github.com/sylabs/singularity-mpi/pkg/container"
30+
"github.com/sylabs/singularity-mpi/pkg/implem"
31+
"github.com/sylabs/singularity-mpi/pkg/mpi"
3232
"github.com/sylabs/singularity-mpi/pkg/sy"
3333
"github.com/sylabs/singularity-mpi/pkg/syexec"
3434
"github.com/sylabs/singularity-mpi/pkg/sys"

pkg/container/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"time"
1919

2020
"github.com/gvallee/go_util/pkg/util"
21-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
2221
"github.com/sylabs/singularity-mpi/pkg/buildenv"
2322
"github.com/sylabs/singularity-mpi/pkg/checker"
23+
"github.com/sylabs/singularity-mpi/pkg/implem"
2424
"github.com/sylabs/singularity-mpi/pkg/sy"
2525
"github.com/sylabs/singularity-mpi/pkg/syexec"
2626
"github.com/sylabs/singularity-mpi/pkg/sys"

pkg/containerizer/containerizer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import (
1515

1616
"github.com/gvallee/go_util/pkg/util"
1717
"github.com/gvallee/kv/pkg/kv"
18-
"github.com/sylabs/singularity-mpi/internal/pkg/builder"
1918
"github.com/sylabs/singularity-mpi/internal/pkg/deffile"
2019
"github.com/sylabs/singularity-mpi/internal/pkg/distro"
21-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
22-
"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
2320
"github.com/sylabs/singularity-mpi/pkg/app"
2421
"github.com/sylabs/singularity-mpi/pkg/buildenv"
22+
"github.com/sylabs/singularity-mpi/pkg/builder"
2523
"github.com/sylabs/singularity-mpi/pkg/container"
24+
"github.com/sylabs/singularity-mpi/pkg/implem"
25+
"github.com/sylabs/singularity-mpi/pkg/mpi"
2626
"github.com/sylabs/singularity-mpi/pkg/sys"
2727
)
2828

pkg/containerizer/containerizer_env.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"path/filepath"
1212

1313
"github.com/gvallee/kv/pkg/kv"
14-
"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
1514
"github.com/sylabs/singularity-mpi/pkg/buildenv"
1615
"github.com/sylabs/singularity-mpi/pkg/container"
16+
"github.com/sylabs/singularity-mpi/pkg/mpi"
1717
"github.com/sylabs/singularity-mpi/pkg/sys"
1818
)
1919

File renamed without changes.
File renamed without changes.
File renamed without changes.

internal/pkg/jm/jobmgr_native.go renamed to pkg/jm/jobmgr_native.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"strconv"
1414

1515
"github.com/sylabs/singularity-mpi/internal/pkg/impi"
16-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
1716
"github.com/sylabs/singularity-mpi/internal/pkg/job"
18-
"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
1917
"github.com/sylabs/singularity-mpi/pkg/buildenv"
18+
"github.com/sylabs/singularity-mpi/pkg/implem"
19+
"github.com/sylabs/singularity-mpi/pkg/mpi"
2020
"github.com/sylabs/singularity-mpi/pkg/syexec"
2121
"github.com/sylabs/singularity-mpi/pkg/sys"
2222
)
File renamed without changes.

internal/pkg/jm/jobmgr_slurm.go renamed to pkg/jm/jobmgr_slurm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616

1717
"github.com/gvallee/kv/pkg/kv"
1818
"github.com/sylabs/singularity-mpi/internal/pkg/job"
19-
"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
2019
"github.com/sylabs/singularity-mpi/internal/pkg/slurm"
2120
"github.com/sylabs/singularity-mpi/internal/pkg/sympierr"
2221
"github.com/sylabs/singularity-mpi/pkg/buildenv"
22+
"github.com/sylabs/singularity-mpi/pkg/mpi"
2323
"github.com/sylabs/singularity-mpi/pkg/sy"
2424
"github.com/sylabs/singularity-mpi/pkg/syexec"
2525
"github.com/sylabs/singularity-mpi/pkg/sys"
File renamed without changes.

pkg/launcher/launcher.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020

2121
"github.com/gvallee/go_util/pkg/util"
2222
"github.com/gvallee/kv/pkg/kv"
23-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
24-
"github.com/sylabs/singularity-mpi/internal/pkg/jm"
2523
"github.com/sylabs/singularity-mpi/internal/pkg/job"
26-
"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
2724
"github.com/sylabs/singularity-mpi/internal/pkg/network"
2825
"github.com/sylabs/singularity-mpi/internal/pkg/slurm"
2926
"github.com/sylabs/singularity-mpi/pkg/app"
3027
"github.com/sylabs/singularity-mpi/pkg/buildenv"
28+
"github.com/sylabs/singularity-mpi/pkg/implem"
29+
"github.com/sylabs/singularity-mpi/pkg/jm"
30+
"github.com/sylabs/singularity-mpi/pkg/mpi"
3131
"github.com/sylabs/singularity-mpi/pkg/results"
3232
"github.com/sylabs/singularity-mpi/pkg/sy"
3333
"github.com/sylabs/singularity-mpi/pkg/syexec"

internal/pkg/mpi/mpi.go renamed to pkg/mpi/mpi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"path/filepath"
1111

1212
"github.com/sylabs/singularity-mpi/internal/pkg/impi"
13-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
1413
"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
1514
"github.com/sylabs/singularity-mpi/internal/pkg/openmpi"
1615
"github.com/sylabs/singularity-mpi/pkg/app"
1716
"github.com/sylabs/singularity-mpi/pkg/buildenv"
1817
"github.com/sylabs/singularity-mpi/pkg/container"
18+
"github.com/sylabs/singularity-mpi/pkg/implem"
1919
"github.com/sylabs/singularity-mpi/pkg/sys"
2020
)
2121

pkg/results/results.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"strings"
1616

1717
"github.com/gvallee/go_util/pkg/util"
18-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
18+
"github.com/sylabs/singularity-mpi/pkg/implem"
1919
)
2020

2121
// Result represents the result of a given experiment

pkg/sy/sy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020

2121
"github.com/gvallee/go_util/pkg/util"
2222
"github.com/gvallee/kv/pkg/kv"
23-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
2423
"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
2524
"github.com/sylabs/singularity-mpi/pkg/buildenv"
2625
"github.com/sylabs/singularity-mpi/pkg/checker"
26+
"github.com/sylabs/singularity-mpi/pkg/implem"
2727
"github.com/sylabs/singularity-mpi/pkg/syexec"
2828
"github.com/sylabs/singularity-mpi/pkg/sys"
2929
)

pkg/sy/sy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
"testing"
1313

14-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
14+
"github.com/sylabs/singularity-mpi/pkg/implem"
1515
"github.com/sylabs/singularity-mpi/pkg/sys"
1616
)
1717

pkg/sympi/sympi.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import (
1818

1919
"github.com/gvallee/go_util/pkg/util"
2020
"github.com/gvallee/kv/pkg/kv"
21-
"github.com/sylabs/singularity-mpi/internal/pkg/builder"
22-
"github.com/sylabs/singularity-mpi/internal/pkg/implem"
23-
"github.com/sylabs/singularity-mpi/internal/pkg/jm"
2421
"github.com/sylabs/singularity-mpi/internal/pkg/manifest"
25-
"github.com/sylabs/singularity-mpi/internal/pkg/mpi"
2622
"github.com/sylabs/singularity-mpi/pkg/app"
2723
"github.com/sylabs/singularity-mpi/pkg/buildenv"
24+
"github.com/sylabs/singularity-mpi/pkg/builder"
2825
"github.com/sylabs/singularity-mpi/pkg/container"
26+
"github.com/sylabs/singularity-mpi/pkg/implem"
27+
"github.com/sylabs/singularity-mpi/pkg/jm"
2928
"github.com/sylabs/singularity-mpi/pkg/launcher"
29+
"github.com/sylabs/singularity-mpi/pkg/mpi"
3030
"github.com/sylabs/singularity-mpi/pkg/sy"
3131
"github.com/sylabs/singularity-mpi/pkg/syexec"
3232
"github.com/sylabs/singularity-mpi/pkg/sys"

0 commit comments

Comments
 (0)