Skip to content

Commit

Permalink
Update Go path to reflect GitHub repo (#13)
Browse files Browse the repository at this point in the history
Update Go path in the source code files
  • Loading branch information
syifan authored May 31, 2023
1 parent 8d911b2 commit ee36faf
Show file tree
Hide file tree
Showing 60 changed files with 769 additions and 46,749 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Regular Test
name: Akita Test

on: push

jobs:
compile:
name: Compile
name: Compile Akita
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -19,7 +19,7 @@ jobs:
run: go build ./...

lint:
name: Lint
name: Lint Akita
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -38,7 +38,7 @@ jobs:
args: --timeout=10m

unit_test:
name: Unit Test
name: Unit Test Akita
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -49,7 +49,7 @@ jobs:
with:
go-version: 'stable'

- name: Unit Test
- name: Unit Test Akita
run: |
go test -coverprofile=cover.out ./...
go tool cover -func=cover.out > coverage.out
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/akitartm_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: AkitaRTM Test

on: push

jobs:
compile:
name: Compile AkitaRTM
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 16.x

- name: Install dependencies
working-directory: ./monitoring/web
run: npm install

- name: Build
working-directory: ./monitoring/web
run: npm run build
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"version": "0.2.0",
"configurations": [
{
"name": "Test gitlab.com/akita/akita/monitoring",
"name": "Test github.com/sarchlab/akita/monitoring",
"type": "go",
"request": "launch",
"mode": "test",
"program": "${workspaceFolder}/monitoring"
},
{
"name": "Test gitlab.com/akita/akita",
"name": "Test github.com/sarchlab/akita",
"type": "go",
"request": "launch",
"mode": "test",
Expand Down
4 changes: 2 additions & 2 deletions doc/gomod.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Experiments usually require the user to start a new repo to hold the starting co
module gitlab.com/syifan/multi_gpu_experiments
require (
gitlab.com/akita/akita v1.2.3
github.com/sarchlab/akita v1.2.3
gitlab.com/akita/gcn3 v1.2.2
gitlab.com/akita/mem v1.1.2
gitlab.com/akita/noc v1.1.1
Expand All @@ -35,7 +35,7 @@ However, editing multiple repos sequentially is not always a solution. For examp
module gitlab.com/syifan/multi_gpu_experiments
require (
gitlab.com/akita/akita v1.2.3
github.com/sarchlab/akita v1.2.3
gitlab.com/akita/gcn3 v1.2.2
gitlab.com/akita/mem v1.1.2
gitlab.com/akita/noc v1.1.1
Expand Down
6 changes: 3 additions & 3 deletions doc/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ import (
"github.com/golang/mock/gomock"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"gitlab.com/akita/akita"
"gitlab.com/akita/akita/mock_akita"
"github.com/sarchlab/akita"
"github.com/sarchlab/akita/mock_akita"
)

var _ = Describe("Forwarder", func() {
Expand Down Expand Up @@ -163,7 +163,7 @@ go install github.com/golang/mock/mockgen
Suppose we want to mock the `Port` interface, we can simply run:

```bash
mockgen gitlab.com/akita/akita Port > mock_akita/mock_port.go
mockgen github.com/sarchlab/akita Port > mock_akita/mock_port.go
```

## Integration Testing
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module gitlab.com/akita/akita/v3
module github.com/sarchlab/akita/v3

require (
github.com/go-sql-driver/mysql v1.7.1
Expand Down
7 changes: 4 additions & 3 deletions monitoring/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ import (
// Enable profiling
_ "net/http/pprof"

"github.com/sarchlab/akita/v3/sim"

"github.com/google/pprof/profile"
"github.com/gorilla/mux"
"github.com/sarchlab/akita/v3/monitoring/web/dist"
"github.com/shirou/gopsutil/process"
"github.com/syifan/goseth"
"gitlab.com/akita/akita/v3/monitoring/web"
"gitlab.com/akita/akita/v3/sim"
)

// Monitor can turn a simulation into a server and allows external monitoring
Expand Down Expand Up @@ -133,7 +134,7 @@ func (m *Monitor) CompleteProgressBar(pb *ProgressBar) {
func (m *Monitor) StartServer() {
r := mux.NewRouter()

fs := web.GetAssets()
fs := dist.GetAssets()
fServer := http.FileServer(fs)
r.HandleFunc("/api/pause", m.pauseEngine)
r.HandleFunc("/api/continue", m.continueEngine)
Expand Down
3 changes: 2 additions & 1 deletion monitoring/monitor_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package monitoring
import (
"reflect"

"github.com/sarchlab/akita/v3/sim"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"gitlab.com/akita/akita/v3/sim"
)

type sampleStruct struct {
Expand Down
Binary file removed monitoring/web/.DS_Store
Binary file not shown.
24 changes: 23 additions & 1 deletion monitoring/web/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
node_modules
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
1 change: 0 additions & 1 deletion monitoring/web/compilation-stats.json

This file was deleted.

85 changes: 85 additions & 0 deletions monitoring/web/dist/assets/index-702f2fca.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions monitoring/web/dist/assets/index-d610f457.css

Large diffs are not rendered by default.

Loading

0 comments on commit ee36faf

Please sign in to comment.