Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New build system migration (issue #298 + 2 more improvements) #311

Open
wants to merge 11 commits into
base: 3.11
Choose a base branch
from
+583 −459
Open

New build system migration (issue #298 + 2 more improvements) #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
643a253
Added ability to initialize geometry from an appropriate .ovf file
Artemkth Feb 4, 2020
f4b8d87
Renamed the function and made it possible to be used from scripts
Artemkth Feb 13, 2020
c863a4b
Merge branch 'master' of https://github.com/Artemkth/3
Artemkth Dec 1, 2020
9e048a4
fixed indentation to same standard
Artemkth Dec 1, 2020
6228456
Changed messagin backend
Artemkth Dec 1, 2020
b70410a
Fixed the initialization of geometry not initializing gpu storage, ad…
Artemkth Dec 1, 2020
776c8a8
Added proper handling of comments in files
Artemkth Dec 7, 2020
7eca9f5
Fixed index out of range
Artemkth Dec 8, 2020
8cd7b45
Fixed an issue with incorrect shape function, separated shape function,
Artemkth May 2, 2021
a801abf
Merge remote-tracking branch 'origin/master' into custom-geom
Artemkth Jul 15, 2022
a9a85a2
Ported mumax3 into go module
Artemkth Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/mumax3-convert/csv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"io"

"github.com/mumax/3/data"
"github.com/mumax/3/v3/data"
)

// comma-separated values
Expand Down
2 changes: 1 addition & 1 deletion cmd/mumax3-convert/gnuplot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"io"

"github.com/mumax/3/data"
"github.com/mumax/3/v3/data"
)

const DELIM = "\t"
Expand Down
2 changes: 1 addition & 1 deletion cmd/mumax3-convert/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"io"

"github.com/mumax/3/data"
"github.com/mumax/3/v3/data"
)

func dumpJSON(f *data.Slice, info data.Meta, out io.Writer) {
Expand Down
12 changes: 6 additions & 6 deletions cmd/mumax3-convert/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ import (
"strconv"
"strings"

"github.com/mumax/3/data"
"github.com/mumax/3/draw"
"github.com/mumax/3/dump"
"github.com/mumax/3/httpfs"
"github.com/mumax/3/oommf"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/draw"
"github.com/mumax/3/v3/dump"
"github.com/mumax/3/v3/httpfs"
"github.com/mumax/3/v3/oommf"
"github.com/mumax/3/v3/util"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/mumax3-convert/normalize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"math"

"github.com/mumax/3/data"
"github.com/mumax/3/v3/data"
)

// normalize vector data to given length
Expand Down
2 changes: 1 addition & 1 deletion cmd/mumax3-convert/numpy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"encoding/binary"
"fmt"
"github.com/mumax/3/data"
"github.com/mumax/3/v3/data"
"io"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/mumax3-convert/resize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strconv"
"strings"

"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

func resize(f *data.Slice, arg string) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/mumax3-convert/vtk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"io"
"log"

"github.com/mumax/3/data"
"github.com/mumax/3/v3/data"
)

func dumpVTK(out io.Writer, q *data.Slice, meta data.Meta, dataformat string) (err error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/mumax3-httpfsd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"net/http"
_ "net/http/pprof"

"github.com/mumax/3/httpfs"
"github.com/mumax/3/v3/httpfs"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/mumax3-script/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"bufio"
"flag"
"fmt"
"github.com/mumax/3/script"
"github.com/mumax/3/v3/script"
"io"
"log"
"os"
Expand Down
4 changes: 2 additions & 2 deletions cmd/mumax3-server/compute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"
"time"

"github.com/mumax/3/httpfs"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/httpfs"
"github.com/mumax/3/v3/util"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/mumax3-server/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"time"

"github.com/mumax/3/httpfs"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/httpfs"
"github.com/mumax/3/v3/util"
)

const MaxRequeue = 10 // maximum number of re-queues, don't run job if re-queued to many times
Expand Down
4 changes: 2 additions & 2 deletions cmd/mumax3-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"sync"
"time"

"github.com/mumax/3/httpfs"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/httpfs"
"github.com/mumax/3/v3/util"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions cmd/mumax3/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"path"
"time"

"github.com/mumax/3/cuda"
"github.com/mumax/3/engine"
"github.com/mumax/3/script"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/cuda"
"github.com/mumax/3/v3/engine"
"github.com/mumax/3/v3/script"
"github.com/mumax/3/v3/util"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/mumax3/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package main
import (
"flag"
"fmt"
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/engine"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/engine"
"io"
"log"
"net/http"
Expand Down
4 changes: 2 additions & 2 deletions cmd/mumax3/vet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io/ioutil"
"os"

"github.com/mumax/3/engine"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/engine"
"github.com/mumax/3/v3/util"
)

// check all input files for errors, don't run.
Expand Down
4 changes: 2 additions & 2 deletions cuda/alloc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"log"
"unsafe"

"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/data"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/data"
)

// Wrapper for cu.MemAlloc, fatal exit on out of memory.
Expand Down
4 changes: 2 additions & 2 deletions cuda/angles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cuda

import (
"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

func SetPhi(s *data.Slice, m *data.Slice) {
Expand Down
4 changes: 2 additions & 2 deletions cuda/anisotropy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cuda

import (
"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

// Add uniaxial magnetocrystalline anisotropy field to Beff.
Expand Down
4 changes: 2 additions & 2 deletions cuda/buffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"log"
"unsafe"

"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/data"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/data"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cuda/bytes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"log"
"unsafe"

"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/util"
)

// 3D byte slice, used for region lookup.
Expand Down
4 changes: 2 additions & 2 deletions cuda/conv_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"log"
"math"

"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

// Output size of R2C FFT with given logic size, expressed in floats.
Expand Down
4 changes: 2 additions & 2 deletions cuda/conv_copypad.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cuda

import (
"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

// Copies src (larger) into dst (smaller).
Expand Down
6 changes: 3 additions & 3 deletions cuda/conv_demag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cuda

import (
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

// Stores the necessary state to perform FFT-accelerated convolution
Expand Down
4 changes: 2 additions & 2 deletions cuda/conv_kernmul.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package cuda
// Launch configs range over all complex elements of fft input. This could be optimized: range only over kernel.

import (
"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

// kernel multiplication for 3D demag convolution, exploiting full kernel symmetry.
Expand Down
4 changes: 2 additions & 2 deletions cuda/conv_mfm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cuda
// Generation of Magnetic Force Microscopy images.

import (
"github.com/mumax/3/data"
"github.com/mumax/3/mag"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/mag"
)

// Stores the necessary state to perform FFT-accelerated convolution
Expand Down
4 changes: 2 additions & 2 deletions cuda/conv_selftest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package cuda
import (
"math/rand"

"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

// Compares FFT-accelerated convolution against brute-force on sparse data.
Expand Down
4 changes: 2 additions & 2 deletions cuda/copypadmul2_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package cuda
*/

import (
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/timer"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/timer"
"sync"
"unsafe"
)
Expand Down
4 changes: 2 additions & 2 deletions cuda/copyunpad_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package cuda
*/

import (
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/timer"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/timer"
"sync"
"unsafe"
)
Expand Down
4 changes: 2 additions & 2 deletions cuda/crop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cuda

import (
"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

// Crop stores in dst a rectangle cropped from src at given offset position.
Expand Down
4 changes: 2 additions & 2 deletions cuda/crop_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package cuda
*/

import (
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/timer"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/timer"
"sync"
"unsafe"
)
Expand Down
4 changes: 2 additions & 2 deletions cuda/crossproduct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cuda

import (
"github.com/mumax/3/data"
"github.com/mumax/3/util"
"github.com/mumax/3/v3/data"
"github.com/mumax/3/v3/util"
)

func CrossProduct(dst, a, b *data.Slice) {
Expand Down
4 changes: 2 additions & 2 deletions cuda/crossproduct_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package cuda
*/

import (
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/timer"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/timer"
"sync"
"unsafe"
)
Expand Down
4 changes: 2 additions & 2 deletions cuda/cubicanisotropy2_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package cuda
*/

import (
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/timer"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/timer"
"sync"
"unsafe"
)
Expand Down
6 changes: 3 additions & 3 deletions cuda/cuda2go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"text/scanner"
"text/template"

"github.com/mumax/3/util"
"github.com/mumax/3/v3/util"
)

func main() {
Expand Down Expand Up @@ -152,8 +152,8 @@ const templText = `package cuda
import(
"unsafe"
"github.com/mumax/3/cuda/cu"
"github.com/mumax/3/timer"
"github.com/mumax/3/v3/cuda/cu"
"github.com/mumax/3/v3/timer"
"sync"
)
Expand Down
Loading