Move sources to the top-level of the repository

.gitattributes

@@ -1 +0,0 @@
-tools/* linguist-vendored=false

.gitignore

@@ -6,5 +6,6 @@
 .\#*
 *~
 \#*
-tools/bin
-tools/dist
+bin
+dist
+samples

Dockerfile.build

@@ -20,7 +20,7 @@ RUN NVIDIA_GDK_SUM=1e32e58f69fe29ee67b845233e7aa9347f37994463252bccbc8bfc8a7104a
     chmod +x gdk.run && ./gdk.run --silent && rm gdk.run
 
 VOLUME /go/bin
-WORKDIR /go/src/github.com/NVIDIA/nvidia-docker/tools/src
+WORKDIR /go/src/github.com/NVIDIA/nvidia-docker/src
 COPY src .
 
 ENV CGO_CFLAGS "-I /usr/local/cuda-6.5/include -I /usr/include/nvidia/gdk"

Makefile

@@ -2,29 +2,88 @@
 
 NV_DOCKER ?= docker
 
-.NOTPARALLEL:
-.PHONY: tools clean install uninstall deb rpm tarball samples
+prefix      ?= /usr/local
+exec_prefix ?= $(prefix)
+bindir      ?= $(exec_prefix)/bin
 
-tools:
-	make -C $(CURDIR)/tools
+CR_NAME  := NVIDIA CORPORATION
+CR_EMAIL := digits@nvidia.com
+PKG_NAME := nvidia-docker
+PKG_VERS := 1.0.0
+PKG_REV  := 1
+ifneq ($(MAKECMDGOALS),rpm)
+PKG_ARCH := amd64
+else
+PKG_ARCH := x86_64
+endif
 
-clean: clean-images
-	make -C $(CURDIR)/tools clean
+BIN_DIR    := $(CURDIR)/bin
+DIST_DIR   := $(CURDIR)/dist
+BUILD_DIR  := $(CURDIR)/build
+DOCKER_BIN := $(BIN_DIR)/nvidia-docker
+PLUGIN_BIN := $(BIN_DIR)/nvidia-docker-plugin
 
-install:
-	make -C $(CURDIR)/tools install
+DOCKER_VERS      := $(shell $(NV_DOCKER) version -f '{{.Client.Version}}')
+DOCKER_VERS_MAJ  := $(shell echo $(DOCKER_VERS) | cut -d. -f1)
+DOCKER_VERS_MIN  := $(shell echo $(DOCKER_VERS) | cut -d. -f2)
+DOCKER_SUPPORTED := $(shell [ $(DOCKER_VERS_MAJ) -eq 1 -a $(DOCKER_VERS_MIN) -ge 9 ] && echo true)
+
+DOCKER_RMI       := $(NV_DOCKER) rmi
+DOCKER_RUN       := $(NV_DOCKER) run --rm --net=host
+DOCKER_IMAGES    := $(NV_DOCKER) images -q $(PKG_NAME)
+DOCKER_BUILD     := $(NV_DOCKER) build --build-arg USER_ID="$(shell id -u)" \
+                                       --build-arg CR_NAME="$(CR_NAME)" \
+                                       --build-arg CR_EMAIL="$(CR_EMAIL)" \
+                                       --build-arg PKG_NAME="$(PKG_NAME)" \
+                                       --build-arg PKG_VERS="$(PKG_VERS)" \
+                                       --build-arg PKG_REV="$(PKG_REV)" \
+                                       --build-arg PKG_ARCH="$(PKG_ARCH)"
+
+.PHONY: all build install uninstall clean distclean tarball deb rpm
+
+all: build
+
+build: distclean
+ifneq ($(DOCKER_SUPPORTED),true)
+	$(error Unsupported Docker version)
+endif
+	@mkdir -p $(BIN_DIR)
+	@$(DOCKER_BUILD) -t $(PKG_NAME):$@ -f Dockerfile.$@ $(CURDIR)
+	@$(DOCKER_RUN) -v $(BIN_DIR):/go/bin:Z $(PKG_NAME):$@
+
+install: build
+	install -D -m 755 -t $(bindir) $(DOCKER_BIN)
+	install -D -m 755 -t $(bindir) $(PLUGIN_BIN)
 
 uninstall:
-	make -C $(CURDIR)/tools uninstall
+	$(RM) $(bindir)/$(notdir $(DOCKER_BIN))
+	$(RM) $(bindir)/$(notdir $(PLUGIN_BIN))
 
-deb:
-	make -C $(CURDIR)/tools deb
+clean:
+	-@$(DOCKER_IMAGES) | xargs $(DOCKER_RMI) 2> /dev/null
+	-@$(DOCKER_RMI) golang:1.5 ubuntu:14.04 centos:7 2> /dev/null
 
-rpm:
-	make -C $(CURDIR)/tools rpm
+distclean:
+	@rm -rf $(BIN_DIR)
+	@rm -rf $(DIST_DIR)
 
-tarball:
-	make -C $(CURDIR)/tools tarball
+tarball: build
+	@mkdir -p $(DIST_DIR)
+	tar --transform='s;.*/;$(PKG_NAME)/;' -caf $(DIST_DIR)/$(PKG_NAME)_$(PKG_VERS)_$(PKG_ARCH).tar.xz $(BIN_DIR)/*
+	@printf "\nFind tarball at $(DIST_DIR)\n\n"
 
-samples:
-	make -C $(CURDIR)/samples/ubuntu-16.04
+deb: tarball
+ifneq ($(DOCKER_SUPPORTED),true)
+	$(error Unsupported Docker version)
+endif
+	@$(DOCKER_BUILD) -t $(PKG_NAME):$@ -f Dockerfile.$@ $(CURDIR)
+	@$(DOCKER_RUN) -ti -v $(DIST_DIR):/dist:Z -v $(BUILD_DIR):/build:Z $(PKG_NAME):$@
+	@printf "\nFind packages at $(DIST_DIR)\n\n"
+
+rpm: tarball
+ifneq ($(DOCKER_SUPPORTED),true)
+	$(error Unsupported Docker version)
+endif
+	@$(DOCKER_BUILD) -t $(PKG_NAME):$@ -f Dockerfile.$@ $(CURDIR)
+	@$(DOCKER_RUN) -ti -v $(DIST_DIR):/dist:Z -v $(BUILD_DIR):/build:Z $(PKG_NAME):$@
+	@printf "\nFind packages at $(DIST_DIR)\n\n"

src/nvidia-docker-plugin/main.go

@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"runtime/debug"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvidia"
+	"github.com/NVIDIA/nvidia-docker/src/nvidia"
 )
 
 var (

src/nvidia-docker-plugin/plugin_api.go

@@ -9,8 +9,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/graceful"
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvidia"
+	"github.com/NVIDIA/nvidia-docker/src/graceful"
+	"github.com/NVIDIA/nvidia-docker/src/nvidia"
 )
 
 const socketName = nvidia.DockerPlugin + ".sock"

src/nvidia-docker-plugin/plugin_volume.go

@@ -11,7 +11,7 @@ import (
 	"path"
 	"regexp"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvidia"
+	"github.com/NVIDIA/nvidia-docker/src/nvidia"
 )
 
 var (

src/nvidia-docker-plugin/remote_api.go

@@ -5,7 +5,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/graceful"
+	"github.com/NVIDIA/nvidia-docker/src/graceful"
 )
 
 type restapi interface {

src/nvidia-docker-plugin/remote_v1.go

@@ -14,7 +14,7 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvidia"
+	"github.com/NVIDIA/nvidia-docker/src/nvidia"
 )
 
 type remoteV10 struct{}

src/nvidia-docker/env.go

@@ -11,7 +11,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/docker"
+	"github.com/NVIDIA/nvidia-docker/src/docker"
 )
 
 const (

src/nvidia-docker/local.go

@@ -5,8 +5,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/docker"
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvidia"
+	"github.com/NVIDIA/nvidia-docker/src/docker"
+	"github.com/NVIDIA/nvidia-docker/src/nvidia"
 )
 
 func GenerateLocalArgs(image string, vols []string) ([]string, error) {

src/nvidia-docker/main.go

@@ -10,8 +10,8 @@ import (
 	"runtime"
 	"runtime/debug"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/docker"
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvidia"
+	"github.com/NVIDIA/nvidia-docker/src/docker"
+	"github.com/NVIDIA/nvidia-docker/src/nvidia"
 )
 
 var (

src/nvidia-docker/utils.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/docker"
+	"github.com/NVIDIA/nvidia-docker/src/docker"
 )
 
 const (

src/nvidia/devices.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/cuda"
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvml"
+	"github.com/NVIDIA/nvidia-docker/src/cuda"
+	"github.com/NVIDIA/nvidia-docker/src/nvml"
 )
 
 type NVMLDevice nvml.Device

src/nvidia/nvidia.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/cuda"
-	"github.com/NVIDIA/nvidia-docker/tools/src/nvml"
+	"github.com/NVIDIA/nvidia-docker/src/cuda"
+	"github.com/NVIDIA/nvidia-docker/src/nvml"
 )
 
 const (

src/nvidia/volumes.go

@@ -17,7 +17,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/NVIDIA/nvidia-docker/tools/src/ldcache"
+	"github.com/NVIDIA/nvidia-docker/src/ldcache"
 )
 
 const (

tools/.dockerignore

@@ -1,2 +0,0 @@
-bin
-dist

tools/Makefile

@@ -1,89 +0,0 @@
-# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
-
-NV_DOCKER ?= docker
-
-prefix      ?= /usr/local
-exec_prefix ?= $(prefix)
-bindir      ?= $(exec_prefix)/bin
-
-CR_NAME  := NVIDIA CORPORATION
-CR_EMAIL := digits@nvidia.com
-PKG_NAME := nvidia-docker
-PKG_VERS := 1.0.0
-PKG_REV  := 1
-ifneq ($(MAKECMDGOALS),rpm)
-PKG_ARCH := amd64
-else
-PKG_ARCH := x86_64
-endif
-
-BIN_DIR    := $(CURDIR)/bin
-DIST_DIR   := $(CURDIR)/dist
-BUILD_DIR  := $(CURDIR)/build
-DOCKER_BIN := $(BIN_DIR)/nvidia-docker
-PLUGIN_BIN := $(BIN_DIR)/nvidia-docker-plugin
-
-DOCKER_VERS      := $(shell $(NV_DOCKER) version -f '{{.Client.Version}}')
-DOCKER_VERS_MAJ  := $(shell echo $(DOCKER_VERS) | cut -d. -f1)
-DOCKER_VERS_MIN  := $(shell echo $(DOCKER_VERS) | cut -d. -f2)
-DOCKER_SUPPORTED := $(shell [ $(DOCKER_VERS_MAJ) -eq 1 -a $(DOCKER_VERS_MIN) -ge 9 ] && echo true)
-
-DOCKER_RMI       := $(NV_DOCKER) rmi
-DOCKER_RUN       := $(NV_DOCKER) run --rm --net=host
-DOCKER_IMAGES    := $(NV_DOCKER) images -q $(PKG_NAME)
-DOCKER_BUILD     := $(NV_DOCKER) build --build-arg USER_ID="$(shell id -u)" \
-                                       --build-arg CR_NAME="$(CR_NAME)" \
-                                       --build-arg CR_EMAIL="$(CR_EMAIL)" \
-                                       --build-arg PKG_NAME="$(PKG_NAME)" \
-                                       --build-arg PKG_VERS="$(PKG_VERS)" \
-                                       --build-arg PKG_REV="$(PKG_REV)" \
-                                       --build-arg PKG_ARCH="$(PKG_ARCH)"
-
-.PHONY: all build install uninstall clean distclean tarball deb rpm
-
-all: build
-
-build: distclean
-ifneq ($(DOCKER_SUPPORTED),true)
-	$(error Unsupported Docker version)
-endif
-	@mkdir -p $(BIN_DIR)
-	@$(DOCKER_BUILD) -t $(PKG_NAME):$@ -f Dockerfile.$@ $(CURDIR)
-	@$(DOCKER_RUN) -v $(BIN_DIR):/go/bin:Z $(PKG_NAME):$@
-
-install: build
-	install -D -m 755 -t $(bindir) $(DOCKER_BIN)
-	install -D -m 755 -t $(bindir) $(PLUGIN_BIN)
-
-uninstall:
-	$(RM) $(bindir)/$(notdir $(DOCKER_BIN))
-	$(RM) $(bindir)/$(notdir $(PLUGIN_BIN))
-
-clean:
-	-@$(DOCKER_IMAGES) | xargs $(DOCKER_RMI) 2> /dev/null
-	-@$(DOCKER_RMI) golang:1.5 ubuntu:14.04 centos:7 2> /dev/null
-
-distclean:
-	@rm -rf $(BIN_DIR)
-	@rm -rf $(DIST_DIR)
-
-tarball: build
-	@mkdir -p $(DIST_DIR)
-	tar --transform='s;.*/;$(PKG_NAME)/;' -caf $(DIST_DIR)/$(PKG_NAME)_$(PKG_VERS)_$(PKG_ARCH).tar.xz $(BIN_DIR)/*
-	@printf "\nFind tarball at $(DIST_DIR)\n\n"
-
-deb: tarball
-ifneq ($(DOCKER_SUPPORTED),true)
-	$(error Unsupported Docker version)
-endif
-	@$(DOCKER_BUILD) -t $(PKG_NAME):$@ -f Dockerfile.$@ $(CURDIR)
-	@$(DOCKER_RUN) -ti -v $(DIST_DIR):/dist:Z -v $(BUILD_DIR):/build:Z $(PKG_NAME):$@
-	@printf "\nFind packages at $(DIST_DIR)\n\n"
-
-rpm: tarball
-ifneq ($(DOCKER_SUPPORTED),true)
-	$(error Unsupported Docker version)
-endif
-	@$(DOCKER_BUILD) -t $(PKG_NAME):$@ -f Dockerfile.$@ $(CURDIR)
-	@$(DOCKER_RUN) -ti -v $(DIST_DIR):/dist:Z -v $(BUILD_DIR):/build:Z $(PKG_NAME):$@
-	@printf "\nFind packages at $(DIST_DIR)\n\n"