Disable GPU sniffer on all non-smoke GPU tests.

The presubmit pipeline does not exercise these, so commit
a689c11a76 broke them.

This change disables the sniffer on all the non-smoke tests to unbreak
the release pipeline. I will then send another change to re-enable them
on tests where the sniffer works fine after manual testing.

Updates #10885

PiperOrigin-RevId: 673555026
This commit is contained in:
Etienne Perot
2024-09-11 15:17:58 -07:00
committed by gVisor bot
parent 14560f6815
commit 0fcb9b7f2e
7 changed files with 17 additions and 7 deletions
+3 -1
View File
@@ -396,7 +396,9 @@ func (*FullyCompatible) IsExpectedFailure(ctx context.Context, env *TestEnvironm
// getContainerOpts returns the container run options to run CUDA tests.
func getContainerOpts() (dockerutil.RunOpts, error) {
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{AllowIncompatibleIoctl: true})
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{
DisableSnifferReason: "TODO(gvisor.dev/issue/10885): Verify that this test works",
})
if err != nil {
return dockerutil.RunOpts{}, fmt.Errorf("failed to get GPU run options: %w", err)
}
+3 -1
View File
@@ -27,7 +27,9 @@ import (
func runNCCL(ctx context.Context, t *testing.T, testName string) {
t.Helper()
c := dockerutil.MakeContainer(ctx, t)
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{AllowIncompatibleIoctl: true})
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{
DisableSnifferReason: "TODO(gvisor.dev/issue/10885): Verify that this test works",
})
if err != nil {
t.Fatalf("Failed to get GPU run options: %v", err)
}
+1 -1
View File
@@ -150,7 +150,7 @@ type dockerServer struct {
// in a local Docker container.
func NewDocker(ctx context.Context, cont *dockerutil.Container, logger testutil.Logger) (*Ollama, error) {
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{
AllowIncompatibleIoctl: true,
DisableSnifferReason: "TODO(gvisor.dev/issue/10885): Verify that this test works",
})
if err != nil {
return nil, fmt.Errorf("failed to get GPU run options: %w", err)
+3 -1
View File
@@ -26,7 +26,9 @@ import (
func runPytorch(ctx context.Context, t *testing.T, scriptPath string, args ...string) {
t.Helper()
c := dockerutil.MakeContainer(ctx, t)
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{AllowIncompatibleIoctl: true})
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{
DisableSnifferReason: "TODO(gvisor.dev/issue/10885): Verify that this test works",
})
if err != nil {
t.Fatalf("Failed to get GPU run options: %v", err)
}
+3 -1
View File
@@ -34,7 +34,9 @@ func TestGPUCheckpointRestore(t *testing.T) {
c := dockerutil.MakeContainer(ctx, t)
defer c.CleanUp(ctx)
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{AllowIncompatibleIoctl: true})
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{
DisableSnifferReason: "TODO(gvisor.dev/issue/10885): Verify that this test works",
})
if err != nil {
t.Fatalf("failed to get GPU run options: %v", err)
}
+1 -1
View File
@@ -48,7 +48,7 @@ func (dr *dockerRunner) Run(ctx context.Context, image string, argv []string) ([
cont := dockerutil.MakeContainer(ctx, dr.logger)
defer cont.CleanUp(ctx)
opts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{
AllowIncompatibleIoctl: true,
DisableSnifferReason: "TODO(gvisor.dev/issue/10885): Verify that this test works",
})
if err != nil {
return nil, fmt.Errorf("failed to get GPU run options: %w", err)
+3 -1
View File
@@ -51,7 +51,9 @@ func doVLLMTest(b *testing.B) {
}
// Run vllm.
runOpts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{AllowIncompatibleIoctl: true})
runOpts, err := dockerutil.GPURunOpts(dockerutil.SniffGPUOpts{
DisableSnifferReason: "TODO(gvisor.dev/issue/10885): Verify that this test works",
})
if err != nil {
b.Fatalf("failed to get GPU run options: %v", err)
}